From dca2b8e04123ed6bd9055433090511ba4cfc1bb3 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期四, 16 七月 2026 22:59:21 +0800
Subject: [PATCH] bug fix
---
src/modules/push/locales/zh-tw.json | 3
build/cool/eps.d.ts | 13 +
src/modules/push/locales/zh-cn.json | 3
src/modules/push/views/auditlog.vue | 27 ++++
src/modules/push/views/compressionweight.vue | 263 +++++++++++++++++++++++++++++++++++++++++++
src/modules/push/views/siteweight.vue | 5
src/modules/push/views/vehiclegps.vue | 6
build/cool/eps.json | 2
src/modules/push/views/cameragps.vue | 6
src/modules/push/locales/en.json | 3
10 files changed, 312 insertions(+), 19 deletions(-)
diff --git a/build/cool/eps.d.ts b/build/cool/eps.d.ts
index ca9debd..d64d605 100644
--- a/build/cool/eps.d.ts
+++ b/build/cool/eps.d.ts
@@ -1195,9 +1195,9 @@
elevation?: number;
/**
- * 瀹氫綅鐘舵��
+ * 瀹氫綅绮惧害
*/
- status?: number;
+ status?: string;
/**
* 鍒涘缓鏃堕棿
@@ -1287,6 +1287,11 @@
businessName?: string;
/**
+ * 绔欑偣绫诲瀷
+ */
+ siteType?: string;
+
+ /**
* 浠绘剰閿��
*/
[key: string]: any;
@@ -1349,9 +1354,9 @@
elevation?: number;
/**
- * 瀹氫綅鐘舵��
+ * 瀹氫綅绮惧害
*/
- status?: number;
+ status?: string;
/**
* 鍒涘缓鏃堕棿
diff --git a/build/cool/eps.json b/build/cool/eps.json
index aeaf593..f9007f0 100644
--- a/build/cool/eps.json
+++ b/build/cool/eps.json
@@ -1 +1 @@
-[{"prefix":"/admin/base/coding","name":"","api":[{"method":"get","path":"/getModuleTree"},{"method":"post","path":"/createCode"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/comm","name":"","api":[{"method":"post","path":"/personUpdate"},{"method":"get","path":"/uploadMode"},{"method":"get","path":"/permmenu"},{"method":"get","path":"/program"},{"method":"get","path":"/person"},{"method":"post","path":"/upload"},{"method":"post","path":"/logout"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/open","name":"","api":[{"method":"get","path":"/refreshToken"},{"method":"get","path":"/captcha"},{"method":"post","path":"/login"},{"method":"get","path":"/html"},{"method":"get","path":"/eps"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/department","name":"BaseSysDepartmentEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/order"},{"method":"post","path":"/list"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/log","name":"BaseSysLogEntity","api":[{"method":"post","path":"/setKeep"},{"method":"get","path":"/getKeep"},{"method":"post","path":"/clear"},{"method":"post","path":"/page"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"濮撳悕","nullable":true,"source":"b.name"},{"propertyName":"action","type":"string","length":"","comment":"琛屼负","nullable":false,"source":"a.action"},{"propertyName":"ip","type":"string","length":"","comment":"ip","nullable":true,"source":"a.ip"}]}},{"prefix":"/admin/base/sys/menu","name":"BaseSysMenuEntity","api":[{"method":"post","path":"/create"},{"method":"post","path":"/export"},{"method":"post","path":"/import"},{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/parse"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/param","name":"BaseSysParamEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/html"},{"method":"get","path":"/info"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"dataType","type":"number","length":"","comment":"鏁版嵁绫诲瀷 0-瀛楃涓� 1-瀵屾枃鏈� 2-鏂囦欢 ","nullable":false,"defaultValue":0,"source":"a.dataType"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"keyName","type":"string","length":"","comment":"閿�","nullable":false,"source":"a.keyName"}]}},{"prefix":"/admin/base/sys/role","name":"BaseSysRoleEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"label","type":"string","length":"50","comment":"瑙掕壊鏍囩","nullable":true,"source":"a.label"}]}},{"prefix":"/admin/base/sys/user","name":"BaseSysUserEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/move"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/basicdata/driver","name":"BasicdataDriverEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["婵�娲�","绂佺敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessId","type":"string","length":"64","comment":"韬唤璇佸彿","nullable":false,"source":"a.businessId"},{"propertyName":"phone","type":"string","length":"32","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"},{"propertyName":"licenseNo","type":"string","length":"64","comment":"椹鹃┒璇佸彿","nullable":true,"source":"a.licenseNo"}]}},{"prefix":"/admin/basicdata/iot","name":"BasicdataIotEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"iotTypeCode","type":"string","length":"","comment":"缁堢绫诲瀷","nullable":false,"source":"a.iotTypeCode"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"iotName","type":"string","length":"","comment":"缁堢鍚嶇О","nullable":false,"source":"a.iotName"},{"propertyName":"iotCode","type":"string","length":"","comment":"缁堢缂栫爜","nullable":false,"source":"a.iotCode"}]}},{"prefix":"/admin/basicdata/site","name":"BasicdataSiteEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"departmentId","type":"number","length":"","comment":"褰掑睘鍗曚綅","nullable":false,"source":"a.departmentId"},{"propertyName":"siteType","type":"string","length":"","comment":"绔欑偣绫诲瀷","nullable":false,"defaultValue":"鏀堕泦鐐�","dict":"sitetype","source":"a.siteType"},{"propertyName":"status","type":"number","length":"","comment":"鏄惁鍚敤","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"address","type":"string","length":"","comment":"鍦板潃","nullable":false,"source":"a.address"},{"propertyName":"leader","type":"string","length":"","comment":"璐熻矗浜�","nullable":false,"source":"a.leader"}]}},{"prefix":"/admin/basicdata/sorter","name":"BasicdataSorterEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["鍦ㄨ亴","绂昏亴","绂佺敤"],"source":"a.status"},{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessName","type":"string","length":"64","comment":"濮撳悕","nullable":false,"source":"a.businessName"},{"propertyName":"businessId","type":"string","length":"32","comment":"韬唤璇佸彿","nullable":true,"source":"a.businessId"},{"propertyName":"phone","type":"string","length":"32","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"}]}},{"prefix":"/admin/basicdata/vehicle","name":"BasicdataVehicleEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"vehicleType","type":"string","length":"","comment":"杞﹀瀷","nullable":false,"defaultValue":"鍘㈠紡璐ц溅","dict":"vehicletype","source":"a.vehicleType"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["鍚敤","绂佺敤"],"source":"a.status"},{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessId","type":"string","length":"32","comment":"杞︾墝鍙�","nullable":false,"source":"a.businessId"},{"propertyName":"defaultDriver","type":"bigint","length":"","comment":"榛樿鍙告満","nullable":true,"source":"a.defaultDriver"}]}},{"prefix":"/admin/basicdata/wastetype","name":"BasicdataWastetypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"isRecyclable","type":"number","length":"","comment":"鏄惁鍙洖鏀�","nullable":false,"defaultValue":0,"dict":["鍚�","鏄�"],"source":"a.isRecyclable"},{"propertyName":"status","type":"number","length":"","comment":"鏄惁鍚敤","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"code","type":"string","length":"","comment":"浠ｇ爜","nullable":false,"source":"a.code"}]}},{"prefix":"/admin/demo/goods","name":"DemoGoodsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[{"propertyName":"title","type":"string","length":"50","comment":"鏍囬","nullable":false,"source":"a.title"}],"keyWordLikeFields":[{"propertyName":"description","type":"string","length":"","comment":"鎻忚堪","nullable":true,"source":"a.description"}]}},{"prefix":"/admin/demo/tenant","name":"DemoGoodsEntity","api":[{"method":"post","path":"/noTenant"},{"method":"post","path":"/noUse"},{"method":"post","path":"/use"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/dict/info","name":"DictInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/types"},{"method":"post","path":"/data"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/dict/type","name":"DictTypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/plugin/info","name":"PluginInfoEntity","api":[{"method":"post","path":"/install"},{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/push/auditlog","name":"PushAuditlogEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"pushType","type":"string","length":"","comment":"鎺ㄩ�佺被鍨�","nullable":false,"defaultValue":"weight","dict":["weight","health_gps","vehicle_gps","driver_anomaly","others"],"source":"a.pushType"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/push/cameragps","name":"PushCameraGpsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"瀹氫綅鐘舵��","nullable":false,"defaultValue":0,"dict":["鏈夋晥瀹氫綅","鏃犳晥瀹氫綅"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"sn","type":"string","length":"","comment":"璁惧搴忓垪鍙�","nullable":false,"source":"a.sn"}]}},{"prefix":"/admin/push/siteweight","name":"PushSiteweightEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"}],"fieldLike":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"}],"keyWordLikeFields":[]}},{"prefix":"/admin/push/vehiclegps","name":"PushVehicleGpsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"瀹氫綅鐘舵��","nullable":false,"defaultValue":0,"dict":["鏈夋晥瀹氫綅","鏃犳晥瀹氫綅"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"sn","type":"string","length":"","comment":"璁惧搴忓垪鍙�","nullable":false,"source":"a.sn"},{"propertyName":"vehicleNo","type":"string","length":"","comment":"杞︾墝鍙�","nullable":true,"source":"a.vehicleNo"}]}},{"prefix":"/admin/push/weight","name":"PushWeightEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"},{"propertyName":"garbageType","type":"string","length":"","comment":"鍨冨溇绫诲瀷","nullable":false,"source":"a.garbageType"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/recycle/data","name":"RecycleDataEntity","api":[{"method":"post","path":"/restore"},{"method":"get","path":"/info"},{"method":"post","path":"/page"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"userName","type":"string","length":"","comment":"濮撳悕","nullable":true,"source":"b.name"},{"propertyName":"url","type":"string","length":"","comment":"璇锋眰鐨勬帴鍙�","nullable":true,"source":"a.url"}]}},{"prefix":"/admin/space/info","name":"SpaceInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"type","type":"string","length":"","comment":"绫诲瀷","nullable":false,"source":"a.type"},{"propertyName":"classifyId","type":"number","length":"","comment":"鍒嗙被ID","nullable":true,"source":"a.classifyId"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/space/type","name":"SpaceTypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/task/info","name":"TaskInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/start"},{"method":"post","path":"/once"},{"method":"post","path":"/stop"},{"method":"get","path":"/info"},{"method":"post","path":"/page"},{"method":"get","path":"/log"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵�� 0-鍋滄 1-杩愯","nullable":false,"defaultValue":1,"source":"a.status"},{"propertyName":"type","type":"number","length":"","comment":"鐘舵�� 0-绯荤粺 1-鐢ㄦ埛","nullable":false,"defaultValue":0,"source":"a.type"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/user/address","name":"UserAddressEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/user/info","name":"UserInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","姝ｅ父","宸叉敞閿�"],"source":"a.status"},{"propertyName":"gender","type":"number","length":"","comment":"鎬у埆","nullable":false,"defaultValue":0,"dict":["鏈煡","鐢�","濂�"],"source":"a.gender"},{"propertyName":"loginType","type":"number","length":"","comment":"鐧诲綍鏂瑰紡","nullable":false,"defaultValue":0,"dict":["灏忕▼搴�","鍏紬鍙�","H5"],"source":"a.loginType"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"nickName","type":"string","length":"","comment":"鏄电О","nullable":true,"source":"a.nickName"},{"propertyName":"phone","type":"string","length":"","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"}]}}]
\ No newline at end of file
+[{"prefix":"/admin/base/coding","name":"","api":[{"method":"get","path":"/getModuleTree"},{"method":"post","path":"/createCode"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/comm","name":"","api":[{"method":"post","path":"/personUpdate"},{"method":"get","path":"/uploadMode"},{"method":"get","path":"/permmenu"},{"method":"get","path":"/program"},{"method":"get","path":"/person"},{"method":"post","path":"/upload"},{"method":"post","path":"/logout"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/open","name":"","api":[{"method":"get","path":"/refreshToken"},{"method":"get","path":"/captcha"},{"method":"post","path":"/login"},{"method":"get","path":"/html"},{"method":"get","path":"/eps"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/department","name":"BaseSysDepartmentEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/order"},{"method":"post","path":"/list"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/log","name":"BaseSysLogEntity","api":[{"method":"post","path":"/setKeep"},{"method":"get","path":"/getKeep"},{"method":"post","path":"/clear"},{"method":"post","path":"/page"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"濮撳悕","nullable":true,"source":"b.name"},{"propertyName":"action","type":"string","length":"","comment":"琛屼负","nullable":false,"source":"a.action"},{"propertyName":"ip","type":"string","length":"","comment":"ip","nullable":true,"source":"a.ip"}]}},{"prefix":"/admin/base/sys/menu","name":"BaseSysMenuEntity","api":[{"method":"post","path":"/create"},{"method":"post","path":"/export"},{"method":"post","path":"/import"},{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/parse"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/base/sys/param","name":"BaseSysParamEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/html"},{"method":"get","path":"/info"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"dataType","type":"number","length":"","comment":"鏁版嵁绫诲瀷 0-瀛楃涓� 1-瀵屾枃鏈� 2-鏂囦欢 ","nullable":false,"defaultValue":0,"source":"a.dataType"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"keyName","type":"string","length":"","comment":"閿�","nullable":false,"source":"a.keyName"}]}},{"prefix":"/admin/base/sys/role","name":"BaseSysRoleEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"label","type":"string","length":"50","comment":"瑙掕壊鏍囩","nullable":true,"source":"a.label"}]}},{"prefix":"/admin/base/sys/user","name":"BaseSysUserEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/move"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/basicdata/driver","name":"BasicdataDriverEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["婵�娲�","绂佺敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessId","type":"string","length":"64","comment":"韬唤璇佸彿","nullable":false,"source":"a.businessId"},{"propertyName":"phone","type":"string","length":"32","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"},{"propertyName":"licenseNo","type":"string","length":"64","comment":"椹鹃┒璇佸彿","nullable":true,"source":"a.licenseNo"}]}},{"prefix":"/admin/basicdata/iot","name":"BasicdataIotEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"iotTypeCode","type":"string","length":"","comment":"缁堢绫诲瀷","nullable":false,"source":"a.iotTypeCode"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"iotName","type":"string","length":"","comment":"缁堢鍚嶇О","nullable":false,"source":"a.iotName"},{"propertyName":"iotCode","type":"string","length":"","comment":"缁堢缂栫爜","nullable":false,"source":"a.iotCode"}]}},{"prefix":"/admin/basicdata/site","name":"BasicdataSiteEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"departmentId","type":"number","length":"","comment":"褰掑睘鍗曚綅","nullable":false,"source":"a.departmentId"},{"propertyName":"siteType","type":"string","length":"","comment":"绔欑偣绫诲瀷","nullable":false,"defaultValue":"鏀堕泦鐐�","dict":"sitetype","source":"a.siteType"},{"propertyName":"status","type":"number","length":"","comment":"鏄惁鍚敤","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"address","type":"string","length":"","comment":"鍦板潃","nullable":false,"source":"a.address"},{"propertyName":"leader","type":"string","length":"","comment":"璐熻矗浜�","nullable":false,"source":"a.leader"}]}},{"prefix":"/admin/basicdata/sorter","name":"BasicdataSorterEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["鍦ㄨ亴","绂昏亴","绂佺敤"],"source":"a.status"},{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessName","type":"string","length":"64","comment":"濮撳悕","nullable":false,"source":"a.businessName"},{"propertyName":"businessId","type":"string","length":"32","comment":"韬唤璇佸彿","nullable":true,"source":"a.businessId"},{"propertyName":"phone","type":"string","length":"32","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"}]}},{"prefix":"/admin/basicdata/vehicle","name":"BasicdataVehicleEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"vehicleType","type":"string","length":"","comment":"杞﹀瀷","nullable":false,"defaultValue":"鍘㈠紡璐ц溅","dict":"vehicletype","source":"a.vehicleType"},{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":0,"dict":["鍚敤","绂佺敤"],"source":"a.status"},{"propertyName":"departmentId","type":"bigint","length":"","comment":"鎵�灞炲崟浣�","nullable":true,"source":"a.departmentId"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"businessId","type":"string","length":"32","comment":"杞︾墝鍙�","nullable":false,"source":"a.businessId"},{"propertyName":"defaultDriver","type":"bigint","length":"","comment":"榛樿鍙告満","nullable":true,"source":"a.defaultDriver"}]}},{"prefix":"/admin/basicdata/wastetype","name":"BasicdataWastetypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"isRecyclable","type":"number","length":"","comment":"鏄惁鍙洖鏀�","nullable":false,"defaultValue":0,"dict":["鍚�","鏄�"],"source":"a.isRecyclable"},{"propertyName":"status","type":"number","length":"","comment":"鏄惁鍚敤","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"name","type":"string","length":"","comment":"鍚嶇О","nullable":false,"source":"a.name"},{"propertyName":"code","type":"string","length":"","comment":"浠ｇ爜","nullable":false,"source":"a.code"}]}},{"prefix":"/admin/demo/goods","name":"DemoGoodsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","鍚敤"],"source":"a.status"}],"fieldLike":[{"propertyName":"title","type":"string","length":"50","comment":"鏍囬","nullable":false,"source":"a.title"}],"keyWordLikeFields":[{"propertyName":"description","type":"string","length":"","comment":"鎻忚堪","nullable":true,"source":"a.description"}]}},{"prefix":"/admin/demo/tenant","name":"DemoGoodsEntity","api":[{"method":"post","path":"/noTenant"},{"method":"post","path":"/noUse"},{"method":"post","path":"/use"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/dict/info","name":"DictInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/types"},{"method":"post","path":"/data"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/dict/type","name":"DictTypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/plugin/info","name":"PluginInfoEntity","api":[{"method":"post","path":"/install"},{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/push/auditlog","name":"PushAuditlogEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"deviceNo","type":"string","length":"","comment":"瀹㈡埛绔疘D","nullable":false,"source":"a.deviceNo"},{"propertyName":"pushType","type":"string","length":"","comment":"鎺ㄩ�佺被鍨�","nullable":false,"defaultValue":"weight","dict":["weight","health_gps","vehicle_gps","driver_anomaly","others"],"source":"a.pushType"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"errorMessage","type":"text","length":"","comment":"閿欒杩斿洖淇℃伅","nullable":true,"source":"a.errorMessage"}]}},{"prefix":"/admin/push/cameragps","name":"PushCameraGpsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"string","length":"","comment":"瀹氫綅绮惧害","nullable":false,"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"sn","type":"string","length":"","comment":"璁惧搴忓垪鍙�","nullable":false,"source":"a.sn"}]}},{"prefix":"/admin/push/siteweight","name":"PushSiteweightEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"},{"propertyName":"siteType","type":"string","length":"","comment":"绔欑偣绫诲瀷","nullable":false,"defaultValue":"鏀堕泦鐐�","dict":"sitetype","source":"d.siteType"}],"fieldLike":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"}],"keyWordLikeFields":[]}},{"prefix":"/admin/push/vehiclegps","name":"PushVehicleGpsEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"string","length":"","comment":"瀹氫綅绮惧害","nullable":false,"source":"a.status"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"sn","type":"string","length":"","comment":"璁惧搴忓垪鍙�","nullable":false,"source":"a.sn"},{"propertyName":"vehicleNo","type":"string","length":"","comment":"杞︾墝鍙�","nullable":true,"source":"a.vehicleNo"}]}},{"prefix":"/admin/push/weight","name":"PushWeightEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"deviceNo","type":"string","length":"","comment":"璁惧鍙�","nullable":false,"source":"a.deviceNo"},{"propertyName":"garbageType","type":"string","length":"","comment":"鍨冨溇绫诲瀷","nullable":false,"source":"a.garbageType"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/recycle/data","name":"RecycleDataEntity","api":[{"method":"post","path":"/restore"},{"method":"get","path":"/info"},{"method":"post","path":"/page"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"userName","type":"string","length":"","comment":"濮撳悕","nullable":true,"source":"b.name"},{"propertyName":"url","type":"string","length":"","comment":"璇锋眰鐨勬帴鍙�","nullable":true,"source":"a.url"}]}},{"prefix":"/admin/space/info","name":"SpaceInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"type","type":"string","length":"","comment":"绫诲瀷","nullable":false,"source":"a.type"},{"propertyName":"classifyId","type":"number","length":"","comment":"鍒嗙被ID","nullable":true,"source":"a.classifyId"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/space/type","name":"SpaceTypeEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/task/info","name":"TaskInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"post","path":"/start"},{"method":"post","path":"/once"},{"method":"post","path":"/stop"},{"method":"get","path":"/info"},{"method":"post","path":"/page"},{"method":"get","path":"/log"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵�� 0-鍋滄 1-杩愯","nullable":false,"defaultValue":1,"source":"a.status"},{"propertyName":"type","type":"number","length":"","comment":"鐘舵�� 0-绯荤粺 1-鐢ㄦ埛","nullable":false,"defaultValue":0,"source":"a.type"}],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/user/address","name":"UserAddressEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[],"fieldLike":[],"keyWordLikeFields":[]}},{"prefix":"/admin/user/info","name":"UserInfoEntity","api":[{"method":"post","path":"/delete"},{"method":"post","path":"/update"},{"method":"get","path":"/info"},{"method":"post","path":"/list"},{"method":"post","path":"/page"},{"method":"post","path":"/add"}],"search":{"fieldEq":[{"propertyName":"status","type":"number","length":"","comment":"鐘舵��","nullable":false,"defaultValue":1,"dict":["绂佺敤","姝ｅ父","宸叉敞閿�"],"source":"a.status"},{"propertyName":"gender","type":"number","length":"","comment":"鎬у埆","nullable":false,"defaultValue":0,"dict":["鏈煡","鐢�","濂�"],"source":"a.gender"},{"propertyName":"loginType","type":"number","length":"","comment":"鐧诲綍鏂瑰紡","nullable":false,"defaultValue":0,"dict":["灏忕▼搴�","鍏紬鍙�","H5"],"source":"a.loginType"}],"fieldLike":[],"keyWordLikeFields":[{"propertyName":"nickName","type":"string","length":"","comment":"鏄电О","nullable":true,"source":"a.nickName"},{"propertyName":"phone","type":"string","length":"","comment":"鎵嬫満鍙�","nullable":true,"source":"a.phone"}]}}]
\ No newline at end of file
diff --git a/src/modules/push/locales/en.json b/src/modules/push/locales/en.json
index 5d3644e..0fcf50e 100644
--- a/src/modules/push/locales/en.json
+++ b/src/modules/push/locales/en.json
@@ -8,6 +8,7 @@
"鍏朵粬鏁版嵁":"鍏朵粬鏁版嵁",
"绔欑偣缂栧彿":"绔欑偣缂栧彿",
"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"绔欑偣绫诲瀷":"绔欑偣绫诲瀷",
"绉伴噸璁惧":"绉伴噸璁惧",
"weight":"weight",
"health_gps":"health_gps",
@@ -28,7 +29,7 @@
"閫熷害":"閫熷害",
"鏂瑰悜瑙�":"鏂瑰悜瑙�",
"娴锋嫈楂樺害":"娴锋嫈楂樺害",
-"瀹氫綅鐘舵��":"瀹氫綅鐘舵��",
+"瀹氫綅绮惧害":"瀹氫綅绮惧害",
"鏈夋晥瀹氫綅":"鏈夋晥瀹氫綅",
"鏃犳晥瀹氫綅":"鏃犳晥瀹氫綅"
}
\ No newline at end of file
diff --git a/src/modules/push/locales/zh-cn.json b/src/modules/push/locales/zh-cn.json
index 5d3644e..0fcf50e 100644
--- a/src/modules/push/locales/zh-cn.json
+++ b/src/modules/push/locales/zh-cn.json
@@ -8,6 +8,7 @@
"鍏朵粬鏁版嵁":"鍏朵粬鏁版嵁",
"绔欑偣缂栧彿":"绔欑偣缂栧彿",
"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"绔欑偣绫诲瀷":"绔欑偣绫诲瀷",
"绉伴噸璁惧":"绉伴噸璁惧",
"weight":"weight",
"health_gps":"health_gps",
@@ -28,7 +29,7 @@
"閫熷害":"閫熷害",
"鏂瑰悜瑙�":"鏂瑰悜瑙�",
"娴锋嫈楂樺害":"娴锋嫈楂樺害",
-"瀹氫綅鐘舵��":"瀹氫綅鐘舵��",
+"瀹氫綅绮惧害":"瀹氫綅绮惧害",
"鏈夋晥瀹氫綅":"鏈夋晥瀹氫綅",
"鏃犳晥瀹氫綅":"鏃犳晥瀹氫綅"
}
\ No newline at end of file
diff --git a/src/modules/push/locales/zh-tw.json b/src/modules/push/locales/zh-tw.json
index 5d3644e..0fcf50e 100644
--- a/src/modules/push/locales/zh-tw.json
+++ b/src/modules/push/locales/zh-tw.json
@@ -8,6 +8,7 @@
"鍏朵粬鏁版嵁":"鍏朵粬鏁版嵁",
"绔欑偣缂栧彿":"绔欑偣缂栧彿",
"绔欑偣鍚嶇О":"绔欑偣鍚嶇О",
+"绔欑偣绫诲瀷":"绔欑偣绫诲瀷",
"绉伴噸璁惧":"绉伴噸璁惧",
"weight":"weight",
"health_gps":"health_gps",
@@ -28,7 +29,7 @@
"閫熷害":"閫熷害",
"鏂瑰悜瑙�":"鏂瑰悜瑙�",
"娴锋嫈楂樺害":"娴锋嫈楂樺害",
-"瀹氫綅鐘舵��":"瀹氫綅鐘舵��",
+"瀹氫綅绮惧害":"瀹氫綅绮惧害",
"鏈夋晥瀹氫綅":"鏈夋晥瀹氫綅",
"鏃犳晥瀹氫綅":"鏃犳晥瀹氫綅"
}
\ No newline at end of file
diff --git a/src/modules/push/views/auditlog.vue b/src/modules/push/views/auditlog.vue
index ac42f3a..089b90b 100644
--- a/src/modules/push/views/auditlog.vue
+++ b/src/modules/push/views/auditlog.vue
@@ -46,7 +46,7 @@
pushType: [
{ label: t("weight"), value: "weight" },
{ label: t("health_gps"), value: "health_gps" },
- { label: t("vehicle_gps"), value: "vehicle_gps" },
+ { label: t("camera_gps"), value: "camera_gps" },
{ label: t("driver_anomaly"), value: "driver_anomaly" },
{ label: t("others"), value: "others" },
],
@@ -68,7 +68,7 @@
label: t("鎺ㄩ�佺被鍨�"),
prop: "pushType",
component: { name: "el-radio-group", options: options.pushType },
- value: 0,
+ value: "weight",
required: true,
},
{
@@ -146,8 +146,29 @@
});
// cl-search
-const Search = useSearch();
+const Search = useSearch({
+ items: [
+ {
+ label: t("瀹㈡埛绔疘D"),
+ prop: "deviceNo",
+ component: { name: "el-input", props: { clearable: true } },
+ span: 12,
+ },
+ {
+ label: t("鎺ㄩ�佺被鍨�"),
+ prop: "pushType",
+ component: {
+ name: "el-select", // 浣跨敤涓嬫媺妗嗘悳绱�
+ options: options.pushType,
+ props: {
+ clearable: true, // 鍏佽娓呯┖鎼滅储鏉′欢
+ placeholder: t("璇烽�夋嫨鎺ㄩ�佺被鍨�")
+ }
+ }
+ }
+ ]
+});
// cl-crud
const Crud = useCrud(
{
diff --git a/src/modules/push/views/cameragps.vue b/src/modules/push/views/cameragps.vue
index 9c75222..7ec61ae 100644
--- a/src/modules/push/views/cameragps.vue
+++ b/src/modules/push/views/cameragps.vue
@@ -122,10 +122,10 @@
span: 12
},
{
- label: t('瀹氫綅鐘舵��'),
+ label: t('瀹氫綅绮惧害'),
prop: "status",
component: { name: "el-radio-group", options: options.status },
- value: 0,
+ value: "A",
required: true
}
]
@@ -156,7 +156,7 @@
{ label: t('閫熷害'), prop: "speed", minWidth: 140, sortable: "custom" },
{ label: t('鏂瑰悜瑙�'), prop: "direction", minWidth: 140, sortable: "custom" },
{ label: t('娴锋嫈楂樺害'), prop: "elevation", minWidth: 140, sortable: "custom" },
- { label: t('瀹氫綅鐘舵��'), prop: "status", minWidth: 120 },
+ { label: t('瀹氫綅绮惧害'), prop: "status", minWidth: 120 },
{
label: t('鍒涘缓鏃堕棿'),
diff --git a/src/modules/push/views/compressionweight.vue b/src/modules/push/views/compressionweight.vue
new file mode 100644
index 0000000..3fba788
--- /dev/null
+++ b/src/modules/push/views/compressionweight.vue
@@ -0,0 +1,263 @@
+<template>
+ <cl-crud ref="Crud">
+ <cl-row>
+ <!-- 鍒锋柊鎸夐挳 -->
+ <cl-refresh-btn />
+ <!-- 鏂板鎸夐挳 -->
+ <cl-add-btn />
+ <!-- 鍒犻櫎鎸夐挳 -->
+ <cl-multi-delete-btn />
+ <cl-flex1 />
+ <!-- 鏉′欢鎼滅储 -->
+ <cl-search ref="Search" />
+ </cl-row>
+
+ <cl-row>
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <cl-table ref="Table" />
+ </cl-row>
+
+ <cl-row>
+ <cl-flex1 />
+ <!-- 鍒嗛〉鎺т欢 -->
+ <cl-pagination />
+ </cl-row>
+
+ <!-- 鏂板銆佺紪杈� -->
+ <cl-upsert ref="Upsert" />
+ </cl-crud>
+</template>
+
+<script lang="ts" setup>
+defineOptions({
+ name: "push-compressionweight",
+});
+import { ref, watch, computed, onMounted } from 'vue';
+import { useCrud, useTable, useUpsert, useSearch } from "@cool-vue/crud";
+import { useCool } from "/@/cool";
+import { useI18n } from "vue-i18n";
+import { useDict } from '../../dict';
+import dayjs from "dayjs";
+
+
+const { service } = useCool();
+const { dict } = useDict();
+const { t } = useI18n();
+
+// 瀛樺偍绔欑偣涓嬫媺妗嗙殑鍔ㄦ�佹暟鎹簮
+const compressionSiteOptions = ref<{ label: string; value: any }[]>([]);
+
+// cl-upsert
+const Upsert = useUpsert({
+ items: [
+ {
+ label: t("閫夋嫨閮ㄩ棬"),
+ prop: "departmentId",
+ component: {
+ name: 'cl-dept-select',
+ props: {
+ multiple: false, // 鍗曢��
+ placeholder: "璇烽�夋嫨閮ㄩ棬",
+ checkStrictly: true, // 鐖跺瓙鑺傜偣涓嶈仈鍔�
+ immediate: true // 绔嬪嵆鍔犺浇閮ㄩ棬鏍�
+ }
+ },
+ span: 12,
+ required: true,
+ },
+ {
+ label: t("绔欑偣缂栧彿"),
+ prop: "businessId",
+ component: {
+ name: 'el-select',
+ props: {
+ placeholder: "璇烽�夋嫨",
+ filterable: true,
+ clearable: true
+ },
+ options: compressionSiteOptions
+ },
+ span: 12,
+ required: true,
+ },
+ {
+ label: t("绉伴噸璁惧"),
+ prop: "deviceNo",
+ component: {
+ name: "el-input",
+ props: {
+ disabled: true,
+ },
+ },
+ value: "浜哄伐濉姤", // 鉁� 鐩存帴缁欏浐瀹�
+ span: 12,
+ required: true,
+ },
+ {
+ label: t("涓婁紶鏃堕棿"),
+ prop: "uploadTime",
+ component: {
+ name: "el-date-picker",
+ props: { type: "datetime", valueFormat: "YYYY-MM-DD HH:mm:ss" },
+ },
+ value: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 鉁� 褰撳墠鏃堕棿
+ span: 12,
+ required: true,
+ },
+ {
+ label: t("鍨冨溇绫诲瀷"),
+ prop: "garbageType",
+ value: "SW64", // 鉁� 鐩存帴閫変腑
+ component: {
+ name: "el-select",
+ props: {
+ placeholder: "骞插瀮鍦�",
+ filterable: false,
+ clearable: false,
+ disabled: true, // 鉁� 鐩存帴绂佺敤
+ },
+ options: [
+ {
+ label: "骞插瀮鍦撅紙SW64锛�",
+ value: "SW64",
+ },
+ ],
+ },
+ span: 12,
+ required: true,
+ },
+ {
+ label: t("鍨冨溇閲嶉噺"),
+ prop: "weight",
+ component: {
+ name: 'el-radio-group',
+ options: dict.get('ratedpayload'),
+ },
+ required: true,
+
+ },
+ {
+ label: t("澶囨敞"),
+ prop: "remark",
+ component: {
+ name: "el-input",
+ props: { type: "textarea", rows: 4 },
+ },
+ },
+ ],
+});
+
+// cl-table
+const Table = useTable({
+ columns: [
+ { type: "selection" },
+ { label: t("鎵�灞炲崟浣�"), prop: "departmentName", minWidth: 140 },
+ { label: t("绔欑偣缂栧彿"), prop: "businessId", minWidth: 140 },
+ { label: t("绔欑偣鍚嶇О"), prop: "businessName", minWidth: 140 },
+ { label: t("绔欑偣绫诲瀷"), prop: "siteType", minWidth: 140 },
+ { label: t("绉伴噸璁惧"), prop: "deviceNo", minWidth: 140 },
+ {
+ label: t("涓婁紶鏃堕棿"),
+ prop: "uploadTime",
+ minWidth: 170,
+ sortable: "custom",
+ component: { name: "cl-date-text" },
+ },
+ { label: t("鍨冨溇绫诲瀷"), prop: "garbageType", minWidth: 120 },
+ { label: t("鍨冨溇鍚嶇О"), prop: "garbageName", minWidth: 120 },
+ { label: t("鍨冨溇閲嶉噺"), prop: "weight", minWidth: 120 },
+ {
+ label: t("澶囨敞"),
+ prop: "remark",
+ showOverflowTooltip: true,
+ minWidth: 200,
+ },
+ {
+ label: t("鍒涘缓鏃堕棿"),
+ prop: "createTime",
+ minWidth: 170,
+ sortable: "desc",
+ component: { name: "cl-date-text" },
+ },
+ {
+ label: t("鏇存柊鏃堕棿"),
+ prop: "updateTime",
+ minWidth: 170,
+ sortable: "custom",
+ component: { name: "cl-date-text" },
+ },
+ { type: "op", buttons: ["edit", "delete"] },
+ ],
+});
+
+// cl-search
+const Search = useSearch({
+ items: [
+ {
+ label: "绔欑偣绫诲瀷",
+ prop: "siteType",
+ value: "鍘嬬缉绔�",
+ component: {
+ name: "el-select",
+ props: {
+ disabled: true,
+ clearable: false,
+ },
+ options: [
+ { label: "鍘嬬缉绔�", value: "鍘嬬缉绔�" },
+ ],
+ },
+ },
+ ],
+});
+
+// cl-crud
+const Crud = useCrud(
+ {
+ service: service.push.siteweight,
+
+ },
+ (app) => {
+ app.refresh({
+ siteType: "鍘嬬缉绔�",
+ });
+ },
+);
+
+// 鍒锋柊
+function refresh(params?: any) {
+ Crud.value?.refresh(params);
+}
+
+
+/**
+ * 鏍稿績閫昏緫锛氱洃鍚儴闂� ID 鐨勫彉鍖�
+ */
+watch(
+ () => Upsert.value?.form.departmentId,
+ async (newDeptId, oldDeptId) => {
+ if (!Upsert.value?.form) return;
+
+ compressionSiteOptions.value = [];
+
+ if (oldDeptId !== undefined) {
+ Upsert.value.form.businessId = undefined;
+ }
+
+ // 濡傛灉娌℃湁閫夋嫨浠讳綍閮ㄩ棬锛屽垯涓璇锋眰
+ if (!newDeptId) return;
+
+ try {
+ const res = await service.basicdata.site.page({ departmentId: newDeptId, siteType: "鍘嬬缉绔�", size: 1000 });
+ // 杞崲涓� el-select 闇�瑕佺殑 { label, value } 鏍煎紡
+ compressionSiteOptions.value = res.list.map((item: any) => ({
+ label: item.businessName, // 绔欑偣鐨勫悕绉�
+ value: item.businessId // 绔欑偣鐨処D
+ }));
+
+ } catch (err) {
+ console.error("鍔犺浇绔欑偣鍒楄〃澶辫触", err);
+ }
+ }
+);
+</script>
diff --git a/src/modules/push/views/siteweight.vue b/src/modules/push/views/siteweight.vue
index 41dcaf2..03a8430 100644
--- a/src/modules/push/views/siteweight.vue
+++ b/src/modules/push/views/siteweight.vue
@@ -67,7 +67,7 @@
},
{
label: t("绔欑偣缂栧彿"),
- prop: "businessId", // <-- 瀵瑰簲鐨勮〃鍗曞瓧娈垫槸 workSiteId
+ prop: "businessId",
component: {
name: 'el-select',
props: {
@@ -145,6 +145,7 @@
{ label: t("鎵�灞炲崟浣�"), prop: "departmentName", minWidth: 140 },
{ label: t("绔欑偣缂栧彿"), prop: "businessId", minWidth: 140 },
{ label: t("绔欑偣鍚嶇О"), prop: "businessName", minWidth: 140 },
+ { label: t("绔欑偣绫诲瀷"), prop: "siteType", minWidth: 140 },
{ label: t("绉伴噸璁惧"), prop: "deviceNo", minWidth: 140 },
{
label: t("涓婁紶鏃堕棿"),
@@ -220,7 +221,7 @@
// 鍙湁鍦ㄦ墜鍔ㄥ垏鎹㈤儴闂紙oldDeptId 鏈夊�硷級鏃讹紝鎵嶆竻绌哄凡閫夋嫨鐨勫��
if (oldDeptId !== undefined) {
- Upsert.value.form.workSiteId = undefined;
+ Upsert.value.form.businessId = undefined;
}
// 濡傛灉娌℃湁閫夋嫨浠讳綍閮ㄩ棬锛屽垯涓璇锋眰
diff --git a/src/modules/push/views/vehiclegps.vue b/src/modules/push/views/vehiclegps.vue
index ae2aaa9..3f1c574 100644
--- a/src/modules/push/views/vehiclegps.vue
+++ b/src/modules/push/views/vehiclegps.vue
@@ -128,10 +128,10 @@
span: 12
},
{
- label: t('瀹氫綅鐘舵��'),
+ label: t('瀹氫綅绮惧害'),
prop: "status",
component: { name: "el-radio-group", options: options.status },
- value: 0,
+ value: "A",
required: true
}
]
@@ -163,7 +163,7 @@
{ label: t('閫熷害'), prop: "speed", minWidth: 140, sortable: "custom" },
{ label: t('鏂瑰悜瑙�'), prop: "direction", minWidth: 140, sortable: "custom" },
{ label: t('娴锋嫈楂樺害'), prop: "elevation", minWidth: 140, sortable: "custom" },
- { label: t('瀹氫綅鐘舵��'), prop: "status", minWidth: 120 },
+ { label: t('瀹氫綅绮惧害'), prop: "status", minWidth: 120 },
{
label: t('鍒涘缓鏃堕棿'),
prop: "createTime",
--
Gitblit v1.9.1