Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
This commit is contained in:
commit
d073270dbb
|
@ -218,6 +218,9 @@ export default {
|
||||||
// delete reqData[config.request.page]
|
// delete reqData[config.request.page]
|
||||||
// delete reqData[config.request.pageSize]
|
// delete reqData[config.request.pageSize]
|
||||||
}
|
}
|
||||||
|
if (this.query[this.orderStr]){
|
||||||
|
reqData[this.orderStr] = this.query[this.orderStr]
|
||||||
|
}
|
||||||
var c = Object.assign({}, this.query, this.tableParams, reqData)
|
var c = Object.assign({}, this.query, this.tableParams, reqData)
|
||||||
try {
|
try {
|
||||||
if (this.apiObj) {
|
if (this.apiObj) {
|
||||||
|
|
|
@ -46,7 +46,6 @@
|
||||||
:apiObj="apiObj"
|
:apiObj="apiObj"
|
||||||
row-key="id"
|
row-key="id"
|
||||||
stripe
|
stripe
|
||||||
:params="params"
|
|
||||||
:query="query"
|
:query="query"
|
||||||
highlightCurrentRow
|
highlightCurrentRow
|
||||||
>
|
>
|
||||||
|
@ -103,7 +102,7 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
if (this.timeRange) {
|
if (this.timeRange.length > 0) {
|
||||||
this.query.start_time = this.timeRange[0]
|
this.query.start_time = this.timeRange[0]
|
||||||
this.query.end_time = this.timeRange[1]
|
this.query.end_time = this.timeRange[1]
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -271,7 +271,7 @@ export default {
|
||||||
},
|
},
|
||||||
handle_add() {},
|
handle_add() {},
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
if (this.timeRange) {
|
if (this.timeRange.length > 0) {
|
||||||
this.query.start_time = this.timeRange[0]
|
this.query.start_time = this.timeRange[0]
|
||||||
this.query.end_time = this.timeRange[1]
|
this.query.end_time = this.timeRange[1]
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue