Commit cec4866b authored by 莫坚培's avatar 莫坚培

fix: 修改时间加一的逻辑

parent 4bc48930
...@@ -34,6 +34,15 @@ let replaceConfigDetailsMap = { ...@@ -34,6 +34,15 @@ let replaceConfigDetailsMap = {
vartype: 'varType' vartype: 'varType'
} }
let addTimeMap = {
"YYYY-MM-DD HH:mm:ss": 1000, // 秒
"YYYY-MM-DD HH:mm": 1000 * 60, // 分
"YYYY-MM-DD HH": 1000 * 60 * 60, // 时
"YYYY-MM-DD": 1000 * 60 * 60 * 24, // 日
"YYYY-MM": 1000 * 60 * 60 * 24 * 30, // 月
"YYYY": 1000 * 60 * 60 * 24 * 365, // 年
}
let requestLoopTimer = null // 轮询定时器 let requestLoopTimer = null // 轮询定时器
let requestLoopDataPool = [] // 各个组件实时刷新的请求数据,放到一个集合里,原来的多个组件请求合并成一个请求发送 let requestLoopDataPool = [] // 各个组件实时刷新的请求数据,放到一个集合里,原来的多个组件请求合并成一个请求发送
let requestLoopStopFlag = false // requestLoopDataPool请求中标志,正在请求时不进行下一波轮询,前一波请求完成才执行下一波 let requestLoopStopFlag = false // requestLoopDataPool请求中标志,正在请求时不进行下一波轮询,前一波请求完成才执行下一波
...@@ -2638,8 +2647,14 @@ function renderLineChart(item) { ...@@ -2638,8 +2647,14 @@ function renderLineChart(item) {
}) })
} }
}) })
// 给结束时间增加一个单位,后台需要
let _format = changeFormat(format)
let _EndTime = moment(endTime).valueOf()
_EndTime += addTimeMap[_format]
let postData = { let postData = {
endTime, endTime: _EndTime,
// format: c.defaultDataConfig.timedate, // format: c.defaultDataConfig.timedate,
statisticsType: c.defaultDataConfig.datavariable, statisticsType: c.defaultDataConfig.datavariable,
startTime, startTime,
...@@ -3097,8 +3112,14 @@ function renderBarChart(item) { ...@@ -3097,8 +3112,14 @@ function renderBarChart(item) {
}) })
} }
}) })
// 给结束时间增加一个单位,后台需要
let _format = changeFormat(format)
let _EndTime = moment(endTime).valueOf()
_EndTime += addTimeMap[_format]
let postData = { let postData = {
endTime, endTime: _EndTime,
// format: c.defaultDataConfig.timedate, // format: c.defaultDataConfig.timedate,
statisticsType: c.defaultDataConfig.datavariable, statisticsType: c.defaultDataConfig.datavariable,
startTime, startTime,
...@@ -3404,8 +3425,14 @@ function renderDashChart(item) { ...@@ -3404,8 +3425,14 @@ function renderDashChart(item) {
}) })
} }
}) })
// 给结束时间增加一个单位,后台需要
let _format = changeFormat(format)
let _EndTime = moment(endTime).valueOf()
_EndTime += addTimeMap[_format]
let postData = { let postData = {
endTime, endTime: _EndTime,
format, format,
startTime, startTime,
statisticsType: c.option.Variable.rangevalue, statisticsType: c.option.Variable.rangevalue,
...@@ -3718,8 +3745,14 @@ function renderPieChart(item) { ...@@ -3718,8 +3745,14 @@ function renderPieChart(item) {
}) })
} }
}) })
// 给结束时间增加一个单位,后台需要
let _format = changeFormat(format)
let _EndTime = moment(endTime).valueOf()
_EndTime += addTimeMap[_format]
let postData = { let postData = {
endTime, endTime: _EndTime,
format, format,
startTime, startTime,
statisticsType: c.defaultDataConfig.datavariable, statisticsType: c.defaultDataConfig.datavariable,
...@@ -4736,18 +4769,6 @@ function renderDatePicker(elem, format, addtime, index, prop, elemIndex, tabType ...@@ -4736,18 +4769,6 @@ function renderDatePicker(elem, format, addtime, index, prop, elemIndex, tabType
} }
} }
// 给结束时间增加一个单位,后台需要
let addTimeMap = {
"YYYY-MM-DD HH:mm:ss": 1000, // 秒
"YYYY-MM-DD HH:mm": 1000 * 60, // 分
"YYYY-MM-DD HH": 1000 * 60 * 60, // 时
"YYYY-MM-DD": 1000 * 60 * 60 * 24, // 日
"YYYY-MM": 1000 * 60 * 60 * 24 * 30, // 月
"YYYY": 1000 * 60 * 60 * 24 * 365, // 年
}
let _EndTime = moment(Controls.ControlList[index].EndTime).valueOf()
_EndTime += addTimeMap[format]
Controls.ControlList[index]._EndTime = moment(new Date(_EndTime)).format(format)
Controls.ControlList[index].PropertyList.type = type Controls.ControlList[index].PropertyList.type = type
Controls.ControlList[index].PropertyList.twoobject.parentselect = twotime.parentselect Controls.ControlList[index].PropertyList.twoobject.parentselect = twotime.parentselect
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
"gulp": "^4.0.2", "gulp": "^4.0.2",
"gulp-babel": "^8.0.0", "gulp-babel": "^8.0.0",
"gulp-connect": "^5.7.0", "gulp-connect": "^5.7.0",
"gulp-imagemin": "5.0.1",
"jszip": "^3.7.1", "jszip": "^3.7.1",
"scp2": "0.5.0", "scp2": "0.5.0",
"ssh2-sftp-client": "6.0.1", "ssh2-sftp-client": "6.0.1",
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @Author: syc攻城狮 * @Author: syc攻城狮
* @description: 本地run的webpack配置 * @description: 本地run的webpack配置
* @Date: 2021-08-19 17:10:54 * @Date: 2021-08-19 17:10:54
* @LastEditors: 莫靓仔 * @LastEditors: mojianpei
* @LastEditTime: 2021-10-13 09:30:21 * @LastEditTime: 2021-10-13 21:43:51
*/ */
const path = require('path') const path = require('path')
// const webpack = require('webpack') // const webpack = require('webpack')
...@@ -31,7 +31,8 @@ module.exports = { ...@@ -31,7 +31,8 @@ module.exports = {
// hot: true, // hot: true,
// 端口号 // 端口号
port: 8002, port: 8002,
host: '192.168.1.113', // 本机ip host: '192.168.31.198', // 本机ip
// host: '192.168.1.113', // 本机ip
// 是否压缩 // 是否压缩
compress: true, compress: true,
// 当前目录 // 当前目录
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment