old mode 100644
new mode 100755
|  |  |  | 
|---|
|  |  |  | @close="close()" | 
|---|
|  |  |  | > | 
|---|
|  |  |  | <div v-loading="isLoging"> | 
|---|
|  |  |  | <el-date-picker v-model="searchFrom" type="datetime" placeholder="选择开始日期时间" default-time="00:00:00" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker> | 
|---|
|  |  |  | <el-date-picker v-model="searchTo" type="datetime" placeholder="选择结束日期时间" default-time="00:00:00" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker> | 
|---|
|  |  |  | <el-date-picker v-model="searchFrom" type="datetime" placeholder="选择开始日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker> | 
|---|
|  |  |  | <el-date-picker v-model="searchTo" type="datetime" placeholder="选择结束日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" size="mini" style="width: 11rem;" align="right" :picker-options="pickerOptions"></el-date-picker> | 
|---|
|  |  |  | <el-button icon="el-icon-search" size="mini" type="primary" @click="onSubmit">查询</el-button> | 
|---|
|  |  |  | </div> | 
|---|
|  |  |  |  | 
|---|
|  |  |  | 
|---|
|  |  |  | onSubmit: function () { | 
|---|
|  |  |  | console.log("onSubmit"); | 
|---|
|  |  |  | this.isLoging = true; | 
|---|
|  |  |  | this.$axios.get(`/api/position/history/${this.channel.deviceId}/${this.channel.channelId}`, { | 
|---|
|  |  |  | let url = `/api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`; | 
|---|
|  |  |  | if (this.channel.channelId) { | 
|---|
|  |  |  | url+="&channelId=${this.channel.channelId}" | 
|---|
|  |  |  | } | 
|---|
|  |  |  | this.$axios.get(url, { | 
|---|
|  |  |  | }).then((res)=> { | 
|---|
|  |  |  | this.isLoging = false; | 
|---|
|  |  |  | if (typeof this.callback == "function") { | 
|---|