-
标准 MQTT
+
标准 MQTT
-
+
@@ -24,22 +34,42 @@
-
+
-
+
.
-
+
.
-
+
.
-
+
@@ -47,31 +77,62 @@
-
-
+
+
-
-
+
+
-
-
+
+
2-60000
-
-
+
+
@@ -97,9 +158,22 @@
-
-
-
+
+
+
@@ -148,16 +222,24 @@
-
+
-
+
@@ -168,8 +250,14 @@
-
+
-
+
-
+
-
\ No newline at end of file
diff --git a/src/components/ChiClonewifi.vue b/src/components/ChiClonewifi.vue
index 2725014..01252fe 100644
--- a/src/components/ChiClonewifi.vue
+++ b/src/components/ChiClonewifi.vue
@@ -5,7 +5,12 @@
@@ -14,7 +19,12 @@
标准 MQTT
-
+
@@ -24,22 +34,42 @@
-
+
-
+
.
-
+
.
-
+
.
-
+
@@ -47,31 +77,62 @@
-
-
+
+
-
-
+
+
-
-
+
+
2-60000
-
-
+
+
@@ -97,9 +158,22 @@
-
-
-
+
+
+
@@ -148,16 +222,24 @@
-
+
-
+
@@ -168,8 +250,14 @@
-
+
-
+
-
-
+
+
@@ -21,7 +33,12 @@
-
+
@@ -31,7 +48,12 @@
-
+
@@ -39,8 +61,15 @@
-
-
+
+
@@ -55,12 +84,13 @@
\ No newline at end of file
+
diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue
index cf63c1f..ff286ed 100644
--- a/src/components/CloneWifi.vue
+++ b/src/components/CloneWifi.vue
@@ -1,104 +1,215 @@
-
-
-
-
-
-
-
-
-
-
MQTT Client
-
-
-
-
-
- 启动
-
-
-
-
-
-
-
-
-
-
-
-
-
- .
-
-
-
-
-
-
- .
-
-
-
-
-
- .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ MQTT Client
+
+
+
+
+
+
+ 启动
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .
+
+
+
+
+
+ .
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
@@ -178,108 +320,166 @@
取 消
+>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/DataAcquire.vue b/src/components/DataAcquire.vue
index 3a0c18a..cc74b76 100644
--- a/src/components/DataAcquire.vue
+++ b/src/components/DataAcquire.vue
@@ -1,38 +1,85 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
@@ -48,6 +95,7 @@ export default {
data() {
return {
loading: false,
+ user_id: "",
options1: [
{
value: "有线区网关1",
@@ -116,9 +164,15 @@ export default {
};
},
- mounted() { },
+ created() {
+ let that = this;
+ window.getParameter = that.getParameter;
+ },
methods: {
+ getParameter(data) {
+ this.user_id = data;
+ },
saveInfo(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
@@ -144,8 +198,8 @@ export default {
});
if (res.status == 200) {
this.$message({
- message: '保存成功',
- type: 'success'
+ message: "保存成功",
+ type: "success",
});
}
console.log(res);
diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue
index e9d66d5..7043e4d 100644
--- a/src/components/DataAcquisition.vue
+++ b/src/components/DataAcquisition.vue
@@ -1,38 +1,85 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
@@ -48,6 +95,7 @@ export default {
data() {
return {
loading: false,
+ user_id: "",
options1: [
{
value: "有线区网关1",
@@ -115,10 +163,16 @@ export default {
innerVisible: false,
};
},
-
- mounted() { },
+ created() {
+ let that = this;
+ window.getParameter = that.getParameter;
+ },
+ mounted() {},
methods: {
+ getParameter(data) {
+ this.user_id = data;
+ },
saveInfo(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
@@ -144,8 +198,8 @@ export default {
});
if (res.status == 200) {
this.$message({
- message: '保存成功',
- type: 'success'
+ message: "保存成功",
+ type: "success",
});
}
console.log(res);
diff --git a/src/components/GateWay.vue b/src/components/GateWay.vue
index f5dbf35..5121bd0 100644
--- a/src/components/GateWay.vue
+++ b/src/components/GateWay.vue
@@ -149,6 +149,7 @@ export default {
data() {
return {
// disabled: true,
+ user_id: "",
// 判断是否保存过
loading: false,
formData: {
@@ -225,6 +226,9 @@ export default {
},
},
methods: {
+ getParameter(data) {
+ this.user_id = data;
+ },
// 封装合并输入框的数据
Merge(value, value1, value2, value3, value4) {
value = value1 + "." + value2 + "." + value3 + "." + value4;
@@ -365,6 +369,8 @@ export default {
},
},
created() {
+ let that = this;
+ window.getParameter = that.getParameter;
this.getUserAnswer();
},
mounted() { },
diff --git a/src/components/GatewayConfiguration.vue b/src/components/GatewayConfiguration.vue
index 8d3dd41..5b13f3e 100644
--- a/src/components/GatewayConfiguration.vue
+++ b/src/components/GatewayConfiguration.vue
@@ -156,6 +156,7 @@
diff --git a/src/components/GatewayMaintenance.vue b/src/components/GatewayMaintenance.vue
index 39e80c9..8958efb 100644
--- a/src/components/GatewayMaintenance.vue
+++ b/src/components/GatewayMaintenance.vue
@@ -193,12 +193,14 @@
diff --git a/src/components/IpConfiguration.vue b/src/components/IpConfiguration.vue
index 1b57b6d..e9768f2 100644
--- a/src/components/IpConfiguration.vue
+++ b/src/components/IpConfiguration.vue
@@ -153,11 +153,11 @@