drone/drone-web-manage.git

			@@ -1079,8 +1079,26 @@
			let dateRange = this.form.date_range;
			console.log('dateRange' + dateRange);

			<<<<<<< HEAD
			this.form.begin_time = this.formatDate(dateRange[0]);
			this.form.end_time = this.formatDate(dateRange[1]);
			=======
			menu: true,
			menuWidth: 210,
			menuClassName: 'cur-menu',
			column: [
			{ label: '序号', prop: 'id', width: 72, ellipsis: true },
			{ label: '工单编号', prop: 'job_info_num', width: 100, ellipsis: true, overHidden: true },
			{ label: '工单名称', prop: 'name', width: 100, ellipsis: true, overHidden: true },
			{ label: '所属单位', prop: 'dept_name', width: 100, ellipsis: true },
			{ label: '发起时间', prop: 'create_time', width: 144, ellipsis: true },
			{ label: '已执行次数', prop: 'job_num', width: 100, ellipsis: true },

			{ label: '工单内容', prop: 'content', width: 160, ellipsis: true, overHidden: true },
			{ label: '关联航线', prop: 'wayline_name', width: 100, ellipsis: true, overHidden: true },
			{ label: '关联算法', prop: 'ai_type_str', width: 100, ellipsis: true, overHidden: true },
			{ label: '关联机巢', prop: 'device_names', width: 100, ellipsis: true, overHidden: true },
			>>>>>>> f5be1b3dd663b012dc74ab1bbca8ffb407e091d7

			const submitData = {
			...this.form,