From 5151d7aac52e01760ba61498496b98de1f835c22 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 19 Sep 2025 14:16:18 +0800
Subject: [PATCH] Merge branch 'feature/v6.0/6.0.2' into prod
---
src/views/device/airport.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/device/airport.vue b/src/views/device/airport.vue
index a02e974..8d91e18 100644
--- a/src/views/device/airport.vue
+++ b/src/views/device/airport.vue
@@ -530,9 +530,10 @@
width: 200,
type: 'daterange',
format: 'YYYY-MM-DD',
- valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD',
startPlaceholder: '保险开始日期',
endPlaceholder: '保险结束日期',
+ align: 'center',
rules: [
{
required: false,
@@ -540,6 +541,9 @@
trigger: 'blur',
},
],
+ formatter: (row, value) => {
+ return value[0]? `${this.$dayjs(value[0]).format('YYYY-MM-DD')}~${this.$dayjs(value[1]).format('YYYY-MM-DD')}` : '/';
+ },
},
// {
// label: '保险有效期',
@@ -612,7 +616,6 @@
editDisplay: false, //编辑显示
// editDisabled: true,
addDisplay: false,
- editDisplay: false,
viewDisplay: false,
// rules: [
// {
@@ -1425,7 +1428,6 @@
area_code: await this.getFullAreaCode(data.area_code),
area_name: this.form.area_name,
cnmode_code: this.getDockModeText(this.form.mode_code),
- // domain: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
domainTxt: data.domain === 0 ? '无人机' : data.domain === 3 ? '机巢' : '未知',
cnstatus: this.form.status === false ? '离线' : '在线',
duration_of_insurance: [data?.insure_start_time || '', data?.insure_expired_time || ''],
--
Gitblit v1.9.3