diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 33a3a93..e593ed4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -58,7 +58,7 @@ import { getTempData, batchExportTempData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 33a3a93..e593ed4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -58,7 +58,7 @@ import { getTempData, batchExportTempData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue index 9595034..2af30d6 100644 --- a/src/views/dataManage/deviceData/listTubeData.vue +++ b/src/views/dataManage/deviceData/listTubeData.vue @@ -52,7 +52,7 @@ import { getTubeData, batchExportTubeData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 33a3a93..e593ed4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -58,7 +58,7 @@ import { getTempData, batchExportTempData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue index 9595034..2af30d6 100644 --- a/src/views/dataManage/deviceData/listTubeData.vue +++ b/src/views/dataManage/deviceData/listTubeData.vue @@ -52,7 +52,7 @@ import { getTubeData, batchExportTubeData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 3d349df..7c4e99d 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -58,7 +58,7 @@ import { getWellData, batchExportWellData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -134,7 +134,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 33a3a93..e593ed4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -58,7 +58,7 @@ import { getTempData, batchExportTempData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue index 9595034..2af30d6 100644 --- a/src/views/dataManage/deviceData/listTubeData.vue +++ b/src/views/dataManage/deviceData/listTubeData.vue @@ -52,7 +52,7 @@ import { getTubeData, batchExportTubeData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 3d349df..7c4e99d 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -58,7 +58,7 @@ import { getWellData, batchExportWellData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -134,7 +134,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue index 599039e..2530876 100644 --- a/src/views/dataManage/deviceData/listWellLiquidData.vue +++ b/src/views/dataManage/deviceData/listWellLiquidData.vue @@ -58,7 +58,7 @@ import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -134,7 +134,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js index 36161f2..940b2a9 100644 --- a/src/utils/dateutils.js +++ b/src/utils/dateutils.js @@ -102,7 +102,15 @@ const endTime = getToday('yyyy-MM-dd hh:mm:ss') return [startTime, endTime] } - +/** + * 获取今日0点到当前日期范围 + * @returns {*[]} + */ +export function getSearchLastDayTime() { + const startTime = `${getToday('yyyy-MM-dd')} 00:00:00` + const endTime = getToday('yyyy-MM-dd hh:mm:ss') + return [startTime, endTime] +} /** * 获取近1月日期范围 * @returns {*[]} diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue index 3cb74ad..21524bb 100644 --- a/src/views/dataManage/deviceData/listDigData.vue +++ b/src/views/dataManage/deviceData/listDigData.vue @@ -58,7 +58,7 @@ import { getDigData, batchExportDigData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue index 6696feb..7bb5316 100644 --- a/src/views/dataManage/deviceData/listGasData.vue +++ b/src/views/dataManage/deviceData/listGasData.vue @@ -52,7 +52,7 @@ import { getGasData, batchExportGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue index fd154dd..c819fa3 100644 --- a/src/views/dataManage/deviceData/listGasdectorData.vue +++ b/src/views/dataManage/deviceData/listGasdectorData.vue @@ -53,7 +53,7 @@ import { getGasdectorData, batchExportGasdectorData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -108,7 +108,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listH2SData.vue b/src/views/dataManage/deviceData/listH2SData.vue index 65c6044..edd2b0e 100644 --- a/src/views/dataManage/deviceData/listH2SData.vue +++ b/src/views/dataManage/deviceData/listH2SData.vue @@ -52,7 +52,7 @@ import { getH2SData, batchExportH2SData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue index 92702af..640cec7 100644 --- a/src/views/dataManage/deviceData/listHarmfulData.vue +++ b/src/views/dataManage/deviceData/listHarmfulData.vue @@ -58,7 +58,7 @@ import { getHarmfulData, batchExportHarmfulData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -118,7 +118,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listHydrantData.vue b/src/views/dataManage/deviceData/listHydrantData.vue index 7116cca..9df4646 100644 --- a/src/views/dataManage/deviceData/listHydrantData.vue +++ b/src/views/dataManage/deviceData/listHydrantData.vue @@ -52,7 +52,7 @@ import { getHydrantData, batchExportHydrantData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -102,7 +102,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue index d818684..ebd55c3 100644 --- a/src/views/dataManage/deviceData/listLiquidData.vue +++ b/src/views/dataManage/deviceData/listLiquidData.vue @@ -57,7 +57,7 @@ import { getLiquidData, batchExportLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -109,7 +109,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listLiquidGasData.vue b/src/views/dataManage/deviceData/listLiquidGasData.vue index 38dba39..2f3b2dd 100644 --- a/src/views/dataManage/deviceData/listLiquidGasData.vue +++ b/src/views/dataManage/deviceData/listLiquidGasData.vue @@ -64,7 +64,7 @@ import { getLiquidGasData, batchExportLiquidGasData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -130,7 +130,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { @@ -143,11 +143,11 @@ // 要是路由里有参数 if (this.$route.query && this.$route.query.devcode) { this.listQuery.keywords = this.$route.query.devcode - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() this.fetchData(false)// 获取数据 } else { // if (this.timeRange.length === 0) { - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() // } this.fetchData() } diff --git a/src/views/dataManage/deviceData/listNoiseData.vue b/src/views/dataManage/deviceData/listNoiseData.vue index ab4faf4..a6e9857 100644 --- a/src/views/dataManage/deviceData/listNoiseData.vue +++ b/src/views/dataManage/deviceData/listNoiseData.vue @@ -58,7 +58,7 @@ import { getNoiseData, batchExportNoiseData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listPantiltData.vue b/src/views/dataManage/deviceData/listPantiltData.vue index a7723f8..070f927 100644 --- a/src/views/dataManage/deviceData/listPantiltData.vue +++ b/src/views/dataManage/deviceData/listPantiltData.vue @@ -53,7 +53,7 @@ import { getPantiltData, batchExportPantiltData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -105,7 +105,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue index 33a3a93..e593ed4 100644 --- a/src/views/dataManage/deviceData/listTempData.vue +++ b/src/views/dataManage/deviceData/listTempData.vue @@ -58,7 +58,7 @@ import { getTempData, batchExportTempData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -111,7 +111,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listTubeData.vue b/src/views/dataManage/deviceData/listTubeData.vue index 9595034..2af30d6 100644 --- a/src/views/dataManage/deviceData/listTubeData.vue +++ b/src/views/dataManage/deviceData/listTubeData.vue @@ -52,7 +52,7 @@ import { getTubeData, batchExportTubeData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -115,7 +115,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue index 3d349df..7c4e99d 100644 --- a/src/views/dataManage/deviceData/listWellCoverData.vue +++ b/src/views/dataManage/deviceData/listWellCoverData.vue @@ -58,7 +58,7 @@ import { getWellData, batchExportWellData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -134,7 +134,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellLiquidData.vue b/src/views/dataManage/deviceData/listWellLiquidData.vue index 599039e..2530876 100644 --- a/src/views/dataManage/deviceData/listWellLiquidData.vue +++ b/src/views/dataManage/deviceData/listWellLiquidData.vue @@ -58,7 +58,7 @@ import { getWellLiquidData, batchExportWellLiquidData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -134,7 +134,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) { diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue index e9609c8..781e3f3 100644 --- a/src/views/dataManage/deviceData/listWellLocaData.vue +++ b/src/views/dataManage/deviceData/listWellLocaData.vue @@ -58,7 +58,7 @@ import { getWellLocaData, batchExportWellLocaData } from '@/api/data/data' import DeptSelect from '../../../components/DeptSelect/index' import { parseUrl } from '@/utils/parseutils' -import { getSearchLastWeekTime } from '@/utils/dateutils' +import { getSearchLastDayTime } from '@/utils/dateutils' import { exportFile } from '@/utils/exportutils' export default { @@ -110,7 +110,7 @@ }, mounted() { // 如果路径里带参数，解析devcode参数 - this.timeRange = getSearchLastWeekTime() + this.timeRange = getSearchLastDayTime() if (window.location.href) { const params = parseUrl(window.location.href) if (params && params.deviceType === this.type && params.devcode) {