From bd1110c681f6be851e202e357ff3a33517d76040 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期六, 18 七月 2026 17:58:33 +0800
Subject: [PATCH] 添加所属单位
---
src/modules/report/locales/zh-tw.json | 2 ++
build/cool/eps.d.ts | 20 ++++++++++++++++++++
src/modules/report/views/dailysite.vue | 1 +
src/modules/report/locales/zh-cn.json | 2 ++
src/modules/push/views/vehiclegps.vue | 16 ++++++++++++++++
src/modules/report/locales/en.json | 2 ++
6 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/build/cool/eps.d.ts b/build/cool/eps.d.ts
index 266208d..4846f61 100644
--- a/build/cool/eps.d.ts
+++ b/build/cool/eps.d.ts
@@ -1560,6 +1560,11 @@
vehicleNo?: string;
/**
+ * 褰掑睘鍗曚綅
+ */
+ departmentId?: number;
+
+ /**
* GPS瀹氫綅鏃堕棿
*/
gpsTime?: Date;
@@ -1603,6 +1608,11 @@
* 鏇存柊鏃堕棿
*/
updateTime?: string;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ departmentName?: string;
/**
* 浠绘剰閿��
@@ -2008,6 +2018,16 @@
siteName?: string;
/**
+ * 閮ㄩ棬ID
+ */
+ departmentId?: number;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ departmentName?: string;
+
+ /**
* 鎬婚噸閲�
*/
weightTotal?: number;
diff --git a/src/modules/push/views/vehiclegps.vue b/src/modules/push/views/vehiclegps.vue
index 3f1c574..c90a20f 100644
--- a/src/modules/push/views/vehiclegps.vue
+++ b/src/modules/push/views/vehiclegps.vue
@@ -84,6 +84,21 @@
span: 12
},
{
+ label: t("閫夋嫨閮ㄩ棬"),
+ prop: "departmentId",
+ component: {
+ name: 'cl-dept-select',
+ props: {
+ multiple: false, // 鍗曢��
+ placeholder: "璇烽�夋嫨閮ㄩ棬",
+ checkStrictly: true, // 鐖跺瓙鑺傜偣涓嶈仈鍔�
+ immediate: true // 绔嬪嵆鍔犺浇閮ㄩ棬鏍�
+ }
+ },
+ span: 12,
+ required: true,
+ },
+ {
label: t('GPS瀹氫綅鏃堕棿'),
prop: "gpsTime",
component: {
@@ -151,6 +166,7 @@
component: { name: "cl-date-text", props: { format: "YYYY-MM-DD" } }
},
{ label: t('杞︾墝鍙�'), prop: "vehicleNo", minWidth: 140 },
+ { label: t('鎵�灞為儴闂�'), prop: "departmentName", minWidth: 140 },
{
label: t('GPS瀹氫綅鏃堕棿'),
prop: "gpsTime",
diff --git a/src/modules/report/locales/en.json b/src/modules/report/locales/en.json
index f55a723..01b1c13 100644
--- a/src/modules/report/locales/en.json
+++ b/src/modules/report/locales/en.json
@@ -14,6 +14,8 @@
"缁撴潫鏃堕棿":"缁撴潫鏃堕棿",
"鏃ユ湡":"鏃ユ湡",
"绔欑偣ID":"绔欑偣鍚嶇О",
+"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"鎵�灞為儴闂�":"鎵�灞為儴闂�",
"鎬婚噸閲�":"鎬婚噸閲�",
"sw60閲嶉噺":"sw60閲嶉噺",
"sw61閲嶉噺":"sw61閲嶉噺",
diff --git a/src/modules/report/locales/zh-cn.json b/src/modules/report/locales/zh-cn.json
index f55a723..01b1c13 100644
--- a/src/modules/report/locales/zh-cn.json
+++ b/src/modules/report/locales/zh-cn.json
@@ -14,6 +14,8 @@
"缁撴潫鏃堕棿":"缁撴潫鏃堕棿",
"鏃ユ湡":"鏃ユ湡",
"绔欑偣ID":"绔欑偣鍚嶇О",
+"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"鎵�灞為儴闂�":"鎵�灞為儴闂�",
"鎬婚噸閲�":"鎬婚噸閲�",
"sw60閲嶉噺":"sw60閲嶉噺",
"sw61閲嶉噺":"sw61閲嶉噺",
diff --git a/src/modules/report/locales/zh-tw.json b/src/modules/report/locales/zh-tw.json
index f55a723..01b1c13 100644
--- a/src/modules/report/locales/zh-tw.json
+++ b/src/modules/report/locales/zh-tw.json
@@ -14,6 +14,8 @@
"缁撴潫鏃堕棿":"缁撴潫鏃堕棿",
"鏃ユ湡":"鏃ユ湡",
"绔欑偣ID":"绔欑偣鍚嶇О",
+"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"鎵�灞為儴闂�":"鎵�灞為儴闂�",
"鎬婚噸閲�":"鎬婚噸閲�",
"sw60閲嶉噺":"sw60閲嶉噺",
"sw61閲嶉噺":"sw61閲嶉噺",
diff --git a/src/modules/report/views/dailysite.vue b/src/modules/report/views/dailysite.vue
index 35596e3..955bcf0 100644
--- a/src/modules/report/views/dailysite.vue
+++ b/src/modules/report/views/dailysite.vue
@@ -462,6 +462,7 @@
component: { name: "cl-date-text", props: { format: "YYYY-MM-DD" } }
},
{ label: t('绔欑偣鍚嶇О'), prop: "siteName", minWidth: 140 },
+ { label: t('鎵�灞炲崟浣�'), prop: "departmentName", minWidth: 140 },
{ label: t('鎬婚噸閲�'), prop: "weightTotal", minWidth: 140, sortable: "custom" },
{ label: t('sw60閲嶉噺'), prop: "weightSw60", minWidth: 140, sortable: "custom" },
{ label: t('sw61閲嶉噺'), prop: "weightSw61", minWidth: 140, sortable: "custom" },
--
Gitblit v1.9.1