From f509d6075ca2941a04bc48fef857d6422e095a9d Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Thu, 1 Aug 2024 16:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E9=81=93=E8=AE=BE?=
=?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=BF=90=E7=BB=B4=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
=?UTF-8?q?apps=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../homePage/components/setConfig/appSet.vue | 555 ++++++++++++++++++
.../components/setConfig/channelSet.vue | 8 +-
.../homePage/components/setConfig/config.vue | 24 +-
.../homePage/components/setConfig/mappSet.vue | 427 ++++++++++++++
src/views/homePage/components/tableMain.vue | 8 +
src/views/msgAuth/index.vue | 57 ++
6 files changed, 1073 insertions(+), 6 deletions(-)
create mode 100644 src/views/homePage/components/setConfig/appSet.vue
create mode 100644 src/views/homePage/components/setConfig/mappSet.vue
diff --git a/src/views/homePage/components/setConfig/appSet.vue b/src/views/homePage/components/setConfig/appSet.vue
new file mode 100644
index 0000000..17a5825
--- /dev/null
+++ b/src/views/homePage/components/setConfig/appSet.vue
@@ -0,0 +1,555 @@
+
+
+
+
+
+
CMDID
+
+
+
+
通道数
+
+
+
+
+
+
+
+
Server
+
+
+
+
Port
+
+
+
+ DELL主站
+ 安全平台
+
+
+
+
+
+
+
网络协议
+
+
+
+
+
+
+
通信规约
+
+
+ {{ item.id }} - {{ item.name }}
+
+
+
+
+ {{ item.id }} - {{ item.name }}
+
+
+
+
+
+
+
+
心跳周期
+
+ 分钟(默认10分钟)
+
+
+
图片质量
+
+ (可在通道配置中定义各自不同的照片压缩率)
+
+
+
+
+
+
工作状态报周期
+
+
+
+
+
+
+
分包大小
+
+ 字节(默认2K)(1KB=1024B)
+
+
+
+
+
+
起始包号 照片
+
+ (0/1,默认为1)
+
+
+
升级
+
+ (0/1,默认为1)
+
+
+
+
+
+
日志保留
+
+ 天(默认15天)
+
+
+
照片保留
+
+ 天(默认15天)
+
+
+
+
+
+
被监测装置
+
+
+
+ 停止传送数据
+ 启用故障上报
+
+
+
+
+
+
原始编号
+
+
+
+
装置密码
+
+
+
+
+
+
+
装置型号
+
+
+
+
生产日期
+
+
+
+
+
+
+
+
生产厂家
+
+
+
+
装置名称
+
+
+
+
+
+
+
diff --git a/src/views/homePage/components/setConfig/channelSet.vue b/src/views/homePage/components/setConfig/channelSet.vue
index 0d42b14..d1556db 100644
--- a/src/views/homePage/components/setConfig/channelSet.vue
+++ b/src/views/homePage/components/setConfig/channelSet.vue
@@ -907,7 +907,11 @@ export default {
type = 1; // 字符串
valueToStore = value;
} else if (typeof value === "number") {
- type = 0; // 整数或浮点数(在JavaScript中,它们都是number类型)
+ if (Number.isInteger(value)) {
+ type = 0; // 整数
+ } else {
+ type = 2; // 浮点数
+ }
valueToStore = value;
} else if (typeof value === "boolean") {
type = 0; // 布尔值转换为整数
@@ -1030,7 +1034,7 @@ export default {
diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 7043f65..7630e57 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -2079,10 +2079,18 @@ export default {
return;
case 6:
console.log("上传日志");
+ let logSetparam = JSON.parse(localStorage.getItem("logset"));
+ if (logSetparam !== null) {
+ console.log(logSetparam);
+ } else {
+ logSetparam = { noSpecData: 0, mTime: 0 };
+ }
var params = {
action: "yw_cmd_upload_i1_zip_log",
//url: "http://180.166.218.222:40101/upload/",
termIds: this.idArray,
+ noSpecData: Number(logSetparam.noSpecData),
+ mTime: Number(logSetparam.mTime),
};
this.changeIssue(params);
return;
diff --git a/src/views/msgAuth/index.vue b/src/views/msgAuth/index.vue
index e47d57e..56c59aa 100644
--- a/src/views/msgAuth/index.vue
+++ b/src/views/msgAuth/index.vue
@@ -51,6 +51,27 @@
>
+
+
日志设置
+
+
+
noSpecData
+
+
+
+
+
mTime
+
+
+
+
保存
+
+
@@ -164,5 +194,32 @@ export default {
}
}
}
+ .logSet {
+ width: 300px;
+ border: 1px solid #f00;
+ padding: 12px;
+ .logMain {
+ .top,
+ .bottom {
+ display: flex;
+ align-items: center;
+ h2 {
+ font-size: 14px;
+ font-weight: normal;
+ margin-right: 8px;
+ text-align: right;
+ width: 100px;
+ }
+ }
+ .top {
+ margin-bottom: 20px;
+ }
+ .savebtn {
+ display: flex;
+ margin-top: 12px;
+ margin-left: auto;
+ }
+ }
+ }
}