diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue index 71f25e3..1466c7c 100644 --- a/src/components/ChiGateway.vue +++ b/src/components/ChiGateway.vue @@ -243,10 +243,6 @@ export default { } }); }, - getParameter(data) { - console.log(data); - this.user_id = data; - }, async saveGate() { let res = await SaveUserAnswer({ mark: "CHGYWG_yx", diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue index 51eb3a4..4928005 100644 --- a/src/components/ChiWireld.vue +++ b/src/components/ChiWireld.vue @@ -425,10 +425,6 @@ export default { } }); }, - getParameter(data) { - console.log(data); - this.user_id = data; - }, Merge(value, value1, value2, value3, value4) { value = value1 + "." + value2 + "." + value3 + "." + value4; return value; diff --git a/src/components/CloneView.vue b/src/components/CloneView.vue index 0b4df12..a8ef3d9 100644 --- a/src/components/CloneView.vue +++ b/src/components/CloneView.vue @@ -4,8 +4,15 @@
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
请确认选择的网关类型与网关实体一致:否则该工程无法下载至实体网关
@@ -182,8 +225,8 @@ export default { // console.log(datas); let res = await SaveUserAnswer({ mark: "DB-IotLite_yx", - // user_id: this.user_id, - user_id: "USER202307301114011710", + user_id: this.user_id, + // user_id: "USER202307301114011710", mark_value: JSON.stringify(this.formData), step: "1", }); @@ -193,7 +236,9 @@ export default { type: "success", }); // sessionStorage.setItem("DB-IotLite_yx", JSON.stringify(this.formData)); - this.$router.push(`/channelconfig?user_id=${'USER202307301114011710'}&firstlabel=${this.formData.wgpz_wgid}`); + this.$router.push( + `/channelconfig?user_id=${this.user_id}&firstlabel=${this.formData.wgpz_wgid}` + ); } else { this.$message({ message: `保存失败,原因是${res.data.message}`, @@ -207,19 +252,19 @@ export default { this.loading = true; let res2 = await GetUserAnswer({ mark: "DB-IotLite_yx", - // user_id: this.user_id, - user_id: "USER202307301114011710", + user_id: this.user_id, + // user_id: "USER202307301114011710", }); this.loading = false; console.log(res2); console.log(res2.data.data.step); if (res2.data.data && res2.data.state) { if (res2.data.data.step == 1) { - this.$router.replace(`/channelconfig?user_id=${"USER202307301114011710"}`) + this.$router.replace(`/channelconfig?user_id=${this.user_id}`); } else if (res2.data.data.step == 2) { - this.$router.replace(`/dbcollectdevice?user_id=${"USER202307301114011710"}`) + this.$router.replace(`/dbcollectdevice?user_id=${this.user_id}`); } else if (res2.data.data.step == 3) { - this.$router.replace(`/dbcollect?user_id=${"USER202307301114011710"}`) + this.$router.replace(`/dbcollect?user_id=${this.user_id}`); } else { console.log(res2.data.data.mark_value); let res3 = JSON.parse(res2.data.data.mark_value); diff --git a/src/components/DataView.vue b/src/components/DataView.vue index 6a3eb7f..5663900 100644 --- a/src/components/DataView.vue +++ b/src/components/DataView.vue @@ -2,31 +2,64 @@网络方式
-协议选择
- -协议选择
+ +