From 200cc509b36992d4547efb19ede53ac537494646 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 08 Nov 2023 16:19:52 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/list/road.vue | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/src/views/list/road.vue b/src/views/list/road.vue
index cc99953..dd0020d 100644
--- a/src/views/list/road.vue
+++ b/src/views/list/road.vue
@@ -16,10 +16,9 @@
>
</a-select>
<a-range-picker
- v-model="timevalue"
- show-time
- @ok="change1()"
- valueFormat="yyyy-MM-DD HH:MM:SS"
+ :show-time="{ format: 'HH:mm' }"
+ @ok="change1"
+ format="YYYY-MM-DD HH:mm"
style="width: 175px; margin-left: 10px"
/>
@@ -169,8 +168,7 @@
import { jsonp } from 'vue-jsonp'
import any = jasmine.any;
import { da } from "date-fns/locale";
-
-
+import {Moment} from 'moment';
@Component({
components: {
@@ -178,12 +176,32 @@
})
export default class road extends Vue {
private timevalue:any=[]
- private change1(){
- console.log(this.timevalue);
+
+ private change1(dates: Moment[]) {
+ this.timevalue=[]
+ this.timevalue=[dates[0].format("YYYY-MM-DD HH:mm"),dates[1].format("YYYY-MM-DD HH:mm")]
+
}
private mounted() {
this.roadmap();
}
+ private dateFormat(fmt: string, date: any) {
+ let o = {
+ "M+": date.getMonth() + 1, //������
+ "d+": date.getDate(), //���
+ "h+": date.getHours(), //������
+ "m+": date.getMinutes(), //���
+ "s+": date.getSeconds(), //���
+ "q+": Math.floor((date.getMonth() + 3) / 3), //������
+ "S": date.getMilliseconds() //������
+ }
+ if (/(y+)/.test(fmt))
+ fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+ for (var k in o)
+ if (new RegExp("(" + k + ")").test(fmt))
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)))
+ return fmt
+}
private map:any
private roadmap(){
this.map = new BMapGL.Map('roadmap')
@@ -201,12 +219,22 @@
private tableLoading: boolean = false;
private columns: any[] = [
{
+ title: "������",
+ dataIndex: "key",
+ key: "key",
+ align: "center",
+ customRender: (text,record,index) => `${index+1}`,
+ width: 60,
+ },
+ {
title: "������������",
- dataIndex: "startPoint"
+ dataIndex: "startPoint",
+ align: "center",
},
{
title: "������",
- customRender: this.opRender
+ customRender: this.opRender,
+ align: "center",
}
];
private openIn(){
@@ -274,11 +302,11 @@
this.check=false
this.startstate='batch'
this.batchshow=true
- this.selectCar();
+ // this.selectCar();
this.batchid=record.coordinateId
}
private handlebatch(){
- this.selectCar()
+ // this.selectCar()
this.batchshow=false
this.handlenull();
}
@@ -297,15 +325,17 @@
this.$message.success(res.data.message)
this.starttime=''
this.endtime=''
- this.selectCar()
+ // this.selectCar()
}))
}
private upa=''
private recordid:any=0
- private handleEditModalVisible(record){
+ private handleEditModalVisible(record) {
+ console.log('dataList',this.dataList)
this.check=false
this.handlebatch()
- this.startstate='none'
+ this.startstate = 'none'
+ this.dataList=[]
this.upa='upa'
this.recordid=record.coordinateId
if(this.carvalue==='������������������'){
@@ -343,7 +373,7 @@
}
private inupa(){
this.upa=''
- this.selectCar()
+ // this.selectCar()
}
private carvalue:any='������������������'
private carIndex:any=[]
@@ -396,6 +426,7 @@
this.$message.warning('���������������')
return
}
+ console.log("this.timevalue",this.timevalue);
get('cruiserInfo/getCruiserInFo',{
mac:this.carvalue,
// time1:'2023-08-05 00:00:00',
@@ -553,14 +584,6 @@
}
}
}
- // private showInfoOver(data){
- // // alert(data);
-
- // }
-
-
-
-
private setZoom(bPoints) {
var view = this.map.getViewport(eval(bPoints));
--
Gitblit v1.8.0