From 3410fae879e796598b80f88b66b250fa14e16620 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Mon, 10 Jun 2024 08:30:22 +0800
Subject: [PATCH] =?UTF-8?q?1078-=E6=B7=BB=E5=8A=A0=E7=BB=88=E7=AB=AF?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E5=89=8D=E7=AB=AFUI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../iot/vmp/jt1078/bean/JTDeviceConfig.java | 18 +-
web_src/src/components/JTDeviceList.vue | 2 +-
web_src/src/components/JTDeviceParam.vue | 296 ++++++++++++++++++
web_src/src/router/index.js | 6 +
4 files changed, 312 insertions(+), 10 deletions(-)
create mode 100755 web_src/src/components/JTDeviceParam.vue
diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java
index 502b3d49d..afcc192b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java
@@ -79,10 +79,10 @@ public class JTDeviceConfig {
@ConfigAttribute(id = 0x23, type="String", description = "从服务器 APN# 该值为空时 !终端应使用主服务器相同配置")
private String apnSlave;
- @ConfigAttribute(id = 0x24, type="String", description = "从服务器无线通信拨号密码 # 该值为空时 !终端应使用主服务器相 同配置")
+ @ConfigAttribute(id = 0x24, type="String", description = "从服务器无线通信拨号用户名 # 该值为空时 !终端应使用主服务器 相同配置")
private String dialingUsernameSlave;
- @ConfigAttribute(id = 0x25, type="String", description = "从服务器备份地址 IP或域名 !主机和端口用冒号分割 !多个服务器 使用分号分割")
+ @ConfigAttribute(id = 0x25, type="String", description = "从服务器无线通信拨号密码 # 该值为空时 !终端应使用主服务器相 同配置")
private String dialingPasswordSlave;
@ConfigAttribute(id = 0x26, type="String", description = "从服务器备份地址 IP或域名 !主机和端口用冒号分割 !多个服务器 使用分号分割")
@@ -133,7 +133,7 @@ public class JTDeviceConfig {
@ConfigAttribute(id = 0x44, type="String", description = "接收终端 SMS 文本报警号码")
private String phoneNumberForReceiveTextAlarm;
- @ConfigAttribute(id = 0x45, type="Long", description = "终端电话接听策略 。0:自动接听；1:ACCON时自动接听 ,OFF时手动接听")
+ @ConfigAttribute(id = 0x45, type="Long", description = "终端电话接听策略 。0:自动接听；1:ACC ON时自动接听 ,OFF时手动接听")
private Long phoneAnsweringPolicy;
@ConfigAttribute(id = 0x46, type="Long", description = "每次最长通话时间 ,单位为秒(s) ,0 为不允许通话 ,0xFFFFFFFF为不限制")
@@ -164,7 +164,7 @@ public class JTDeviceConfig {
private Long KeySign;
@ConfigAttribute(id = 0x55, type="Long", description = "最高速度 ,单位为千米每小时(km/h)")
- private Long topSpeed;
+ private Long maxSpeed;
@ConfigAttribute(id = 0x56, type="Long", description = "超速持续时间 ,单位为秒(s)")
private Long overSpeedDuration;
@@ -705,12 +705,12 @@ public class JTDeviceConfig {
KeySign = keySign;
}
- public Long getTopSpeed() {
- return topSpeed;
+ public Long getMaxSpeed() {
+ return maxSpeed;
}
- public void setTopSpeed(Long topSpeed) {
- this.topSpeed = topSpeed;
+ public void setMaxSpeed(Long maxSpeed) {
+ this.maxSpeed = maxSpeed;
}
public Long getOverSpeedDuration() {
@@ -1056,7 +1056,7 @@ public class JTDeviceConfig {
", alarmShootingSwitch： " + alarmShootingSwitch +
", alarmShootingStorageFlags： " + alarmShootingStorageFlags +
", KeySign： " + KeySign +
- ", topSpeed： " + topSpeed +
+ ", topSpeed： " + maxSpeed +
", overSpeedDuration： " + overSpeedDuration +
", continuousDrivingTimeThreshold： " + continuousDrivingTimeThreshold +
", cumulativeDrivingTimeThresholdForTheDay： " + cumulativeDrivingTimeThresholdForTheDay +
diff --git a/web_src/src/components/JTDeviceList.vue b/web_src/src/components/JTDeviceList.vue
index dfe3429cc..34d2fd0e8 100755
--- a/web_src/src/components/JTDeviceList.vue
+++ b/web_src/src/components/JTDeviceList.vue
@@ -220,7 +220,7 @@ export default {
},
moreClick: function (command, itemData) {
if (command === "params") {
- this.queryRecords(itemData)
+ this.$router.push(`/jtDeviceParams/${itemData.phoneNumber}`);
}else if (command === "connection") {
this.queryCloudRecords(itemData)
}else {
diff --git a/web_src/src/components/JTDeviceParam.vue b/web_src/src/components/JTDeviceParam.vue
new file mode 100755
index 000000000..5c59dee37
--- /dev/null
+++ b/web_src/src/components/JTDeviceParam.vue
@@ -0,0 +1,296 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 定时汇报
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 定时汇报
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认
+ 取消
+
+
+
+