root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

Browse Source
This commit is contained in:
loujf
2022-09-06 16:21:27 +08:00
parent 4e16de1708 70edf108f8
commit d58df85b69
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/qd/src/views/monitor/logback/index.vue
View File

@@ -31,6 +31,8 @@
</el-form-item> </el-form-item>
<el-form-item label="时间范围" style="margin-left: 10px" v-show="!showOptions"> <el-form-item label="时间范围" style="margin-left: 10px" v-show="!showOptions">
<el-date-picker <el-date-picker
@change="queryData"
@blur="queryData"
v-model="timeRange" v-model="timeRange"
size="mini" size="mini"
clearable clearable
@@ -251,6 +253,9 @@ export default {
if (this.timeRange.length !== 0) { // 如果是输入时间范围 if (this.timeRange.length !== 0) { // 如果是输入时间范围
queryParam.start = (new Date(this.timeRange[0]).getTime() * 1000000).toString() queryParam.start = (new Date(this.timeRange[0]).getTime() * 1000000).toString()
queryParam.end = (new Date(this.timeRange[1]).getTime() * 1000000).toString() queryParam.end = (new Date(this.timeRange[1]).getTime() * 1000000).toString()
console.log(queryParam.start)
console.log('-----------------------------')
console.log(queryParam.end)
} }
if (this.timeZoneValue) { if (this.timeZoneValue) {
// console.log('时差：', this.timeZoneValue) // console.log('时差：', this.timeZoneValue)

2
wms/qd/src/api/wms/pdm/producetask.js
View File

@@ -101,7 +101,7 @@ export function mandFinish(data) {
export function issued(data) { export function issued(data) {
return request({ return request({
url: 'api/producetask/npm', url: 'api/producetask/issued',
method: 'put', method: 'put',
data data
}) })