From 999598a162a65de54a8600110d3d4ccdadf2be93 Mon Sep 17 00:00:00 2001 From: unknown <1535852499@qq.com> Date: Sat, 11 Nov 2023 14:44:21 +0800 Subject: [PATCH] 11-11 --- .../components/ChiClone_20231111142837.vue | 875 +++++++++++ .../components/ChiClone_20231111142909.vue | 876 +++++++++++ .../components/ChiClone_20231111142913.vue | 876 +++++++++++ .../ChiClonewifi_20231111143142.vue | 872 +++++++++++ .../ChiCollection_20231111143219.vue | 758 ++++++++++ .../ChiCollectionwifi_20231111143223.vue | 756 ++++++++++ .../components/ChiDevice_20231111143229.vue | 833 ++++++++++ .../ChiDevicewifi_20231111143233.vue | 821 ++++++++++ .../src/components/ChiGate_20231111143302.vue | 264 ++++ .../components/ChiGateway_20231111143312.vue | 225 +++ .../components/ChiGatewifi_20231111143319.vue | 227 +++ .../components/ChiGatewifi_20231111143320.vue | 227 +++ .../components/ChiWireld_20231111143327.vue | 549 +++++++ .../components/CloneView_20231111143334.vue | 864 +++++++++++ .../components/CloneWifi_20231111143338.vue | 864 +++++++++++ .../CollectionView_20231111143344.vue | 765 ++++++++++ .../CollectionView_20231111143345.vue | 765 ++++++++++ .../CollectionWifi_20231111143350.vue | 718 +++++++++ .../components/DataAcquire_20231111141252.vue | 211 +++ .../components/DataAcquire_20231111141327.vue | 212 +++ .../components/DataAcquire_20231111141537.vue | 212 +++ .../components/DataAcquire_20231111141644.vue | 212 +++ .../components/DataAcquire_20231111141703.vue | 212 +++ .../components/DataAcquire_20231111141726.vue | 213 +++ .../components/DataAcquire_20231111143404.vue | 213 +++ .../DataAcquisition_20231111141312.vue | 218 +++ .../DataAcquisition_20231111141336.vue | 218 +++ .../DataAcquisition_20231111143359.vue | 218 +++ .../components/DataView_20231111143411.vue | 799 ++++++++++ .../components/DeviceVIew_20231111143421.vue | 495 ++++++ .../components/DeviceWirle_20231111143454.vue | 528 +++++++ .../components/DeviceWirle_20231111144101.vue | 529 +++++++ .../src/components/GateWay_20231111143511.vue | 646 ++++++++ .../components/SerialPort_20231111140527.vue | 1336 ++++++++++++++++ .../components/SerialPort_20231111143923.vue | 1336 ++++++++++++++++ .../components/SerialPort_20231111144027.vue | 1337 +++++++++++++++++ .../components/TreeView_20231111143535.vue | 822 ++++++++++ src/components/ChiClone.vue | 3 +- src/components/ChiClonewifi.vue | 2 +- src/components/ChiCollection.vue | 2 +- src/components/ChiCollectionwifi.vue | 2 +- src/components/ChiDevice.vue | 2 +- src/components/ChiDevicewifi.vue | 2 +- src/components/ChiGate.vue | 2 +- src/components/ChiGateway.vue | 2 +- src/components/ChiGatewifi.vue | 2 +- src/components/ChiWireld.vue | 2 +- src/components/CloneView.vue | 2 +- src/components/CloneWifi.vue | 2 +- src/components/CollectionView.vue | 2 +- src/components/CollectionWifi.vue | 2 +- src/components/DataAcquire.vue | 27 +- src/components/DataAcquisition.vue | 18 +- src/components/DataView.vue | 2 +- src/components/DeviceVIew.vue | 2 +- src/components/DeviceWirle.vue | 3 +- src/components/GateWay.vue | 2 +- src/components/SerialPort.vue | 3 +- src/components/TreeView.vue | 2 +- 59 files changed, 22152 insertions(+), 38 deletions(-) create mode 100644 .history/src/components/ChiClone_20231111142837.vue create mode 100644 .history/src/components/ChiClone_20231111142909.vue create mode 100644 .history/src/components/ChiClone_20231111142913.vue create mode 100644 .history/src/components/ChiClonewifi_20231111143142.vue create mode 100644 .history/src/components/ChiCollection_20231111143219.vue create mode 100644 .history/src/components/ChiCollectionwifi_20231111143223.vue create mode 100644 .history/src/components/ChiDevice_20231111143229.vue create mode 100644 .history/src/components/ChiDevicewifi_20231111143233.vue create mode 100644 .history/src/components/ChiGate_20231111143302.vue create mode 100644 .history/src/components/ChiGateway_20231111143312.vue create mode 100644 .history/src/components/ChiGatewifi_20231111143319.vue create mode 100644 .history/src/components/ChiGatewifi_20231111143320.vue create mode 100644 .history/src/components/ChiWireld_20231111143327.vue create mode 100644 .history/src/components/CloneView_20231111143334.vue create mode 100644 .history/src/components/CloneWifi_20231111143338.vue create mode 100644 .history/src/components/CollectionView_20231111143344.vue create mode 100644 .history/src/components/CollectionView_20231111143345.vue create mode 100644 .history/src/components/CollectionWifi_20231111143350.vue create mode 100644 .history/src/components/DataAcquire_20231111141252.vue create mode 100644 .history/src/components/DataAcquire_20231111141327.vue create mode 100644 .history/src/components/DataAcquire_20231111141537.vue create mode 100644 .history/src/components/DataAcquire_20231111141644.vue create mode 100644 .history/src/components/DataAcquire_20231111141703.vue create mode 100644 .history/src/components/DataAcquire_20231111141726.vue create mode 100644 .history/src/components/DataAcquire_20231111143404.vue create mode 100644 .history/src/components/DataAcquisition_20231111141312.vue create mode 100644 .history/src/components/DataAcquisition_20231111141336.vue create mode 100644 .history/src/components/DataAcquisition_20231111143359.vue create mode 100644 .history/src/components/DataView_20231111143411.vue create mode 100644 .history/src/components/DeviceVIew_20231111143421.vue create mode 100644 .history/src/components/DeviceWirle_20231111143454.vue create mode 100644 .history/src/components/DeviceWirle_20231111144101.vue create mode 100644 .history/src/components/GateWay_20231111143511.vue create mode 100644 .history/src/components/SerialPort_20231111140527.vue create mode 100644 .history/src/components/SerialPort_20231111143923.vue create mode 100644 .history/src/components/SerialPort_20231111144027.vue create mode 100644 .history/src/components/TreeView_20231111143535.vue diff --git a/.history/src/components/ChiClone_20231111142837.vue b/.history/src/components/ChiClone_20231111142837.vue new file mode 100644 index 0000000..74e0e29 --- /dev/null +++ b/.history/src/components/ChiClone_20231111142837.vue @@ -0,0 +1,875 @@ + + + + + + diff --git a/.history/src/components/ChiClone_20231111142909.vue b/.history/src/components/ChiClone_20231111142909.vue new file mode 100644 index 0000000..985b6f6 --- /dev/null +++ b/.history/src/components/ChiClone_20231111142909.vue @@ -0,0 +1,876 @@ + + + + + + diff --git a/.history/src/components/ChiClone_20231111142913.vue b/.history/src/components/ChiClone_20231111142913.vue new file mode 100644 index 0000000..985b6f6 --- /dev/null +++ b/.history/src/components/ChiClone_20231111142913.vue @@ -0,0 +1,876 @@ + + + + + + diff --git a/.history/src/components/ChiClonewifi_20231111143142.vue b/.history/src/components/ChiClonewifi_20231111143142.vue new file mode 100644 index 0000000..ca06a95 --- /dev/null +++ b/.history/src/components/ChiClonewifi_20231111143142.vue @@ -0,0 +1,872 @@ + + + + + + + diff --git a/.history/src/components/ChiCollection_20231111143219.vue b/.history/src/components/ChiCollection_20231111143219.vue new file mode 100644 index 0000000..8eae0d2 --- /dev/null +++ b/.history/src/components/ChiCollection_20231111143219.vue @@ -0,0 +1,758 @@ + + + + + + diff --git a/.history/src/components/ChiCollectionwifi_20231111143223.vue b/.history/src/components/ChiCollectionwifi_20231111143223.vue new file mode 100644 index 0000000..50b6f26 --- /dev/null +++ b/.history/src/components/ChiCollectionwifi_20231111143223.vue @@ -0,0 +1,756 @@ + + + + + + diff --git a/.history/src/components/ChiDevice_20231111143229.vue b/.history/src/components/ChiDevice_20231111143229.vue new file mode 100644 index 0000000..5f07c16 --- /dev/null +++ b/.history/src/components/ChiDevice_20231111143229.vue @@ -0,0 +1,833 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/ChiDevicewifi_20231111143233.vue b/.history/src/components/ChiDevicewifi_20231111143233.vue new file mode 100644 index 0000000..73882da --- /dev/null +++ b/.history/src/components/ChiDevicewifi_20231111143233.vue @@ -0,0 +1,821 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/ChiGate_20231111143302.vue b/.history/src/components/ChiGate_20231111143302.vue new file mode 100644 index 0000000..ed0fc69 --- /dev/null +++ b/.history/src/components/ChiGate_20231111143302.vue @@ -0,0 +1,264 @@ + + + + + + diff --git a/.history/src/components/ChiGateway_20231111143312.vue b/.history/src/components/ChiGateway_20231111143312.vue new file mode 100644 index 0000000..2fcf21e --- /dev/null +++ b/.history/src/components/ChiGateway_20231111143312.vue @@ -0,0 +1,225 @@ + + + + + + diff --git a/.history/src/components/ChiGatewifi_20231111143319.vue b/.history/src/components/ChiGatewifi_20231111143319.vue new file mode 100644 index 0000000..113c249 --- /dev/null +++ b/.history/src/components/ChiGatewifi_20231111143319.vue @@ -0,0 +1,227 @@ + + + + + + diff --git a/.history/src/components/ChiGatewifi_20231111143320.vue b/.history/src/components/ChiGatewifi_20231111143320.vue new file mode 100644 index 0000000..113c249 --- /dev/null +++ b/.history/src/components/ChiGatewifi_20231111143320.vue @@ -0,0 +1,227 @@ + + + + + + diff --git a/.history/src/components/ChiWireld_20231111143327.vue b/.history/src/components/ChiWireld_20231111143327.vue new file mode 100644 index 0000000..3404fea --- /dev/null +++ b/.history/src/components/ChiWireld_20231111143327.vue @@ -0,0 +1,549 @@ + + + + + + diff --git a/.history/src/components/CloneView_20231111143334.vue b/.history/src/components/CloneView_20231111143334.vue new file mode 100644 index 0000000..08f8b1b --- /dev/null +++ b/.history/src/components/CloneView_20231111143334.vue @@ -0,0 +1,864 @@ + + + + + + diff --git a/.history/src/components/CloneWifi_20231111143338.vue b/.history/src/components/CloneWifi_20231111143338.vue new file mode 100644 index 0000000..2aa6618 --- /dev/null +++ b/.history/src/components/CloneWifi_20231111143338.vue @@ -0,0 +1,864 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/CollectionView_20231111143344.vue b/.history/src/components/CollectionView_20231111143344.vue new file mode 100644 index 0000000..02a4452 --- /dev/null +++ b/.history/src/components/CollectionView_20231111143344.vue @@ -0,0 +1,765 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/CollectionView_20231111143345.vue b/.history/src/components/CollectionView_20231111143345.vue new file mode 100644 index 0000000..02a4452 --- /dev/null +++ b/.history/src/components/CollectionView_20231111143345.vue @@ -0,0 +1,765 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/CollectionWifi_20231111143350.vue b/.history/src/components/CollectionWifi_20231111143350.vue new file mode 100644 index 0000000..a9fb006 --- /dev/null +++ b/.history/src/components/CollectionWifi_20231111143350.vue @@ -0,0 +1,718 @@ + + + + + + \ No newline at end of file diff --git a/.history/src/components/DataAcquire_20231111141252.vue b/.history/src/components/DataAcquire_20231111141252.vue new file mode 100644 index 0000000..ffdffe0 --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141252.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111141327.vue b/.history/src/components/DataAcquire_20231111141327.vue new file mode 100644 index 0000000..acba582 --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141327.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111141537.vue b/.history/src/components/DataAcquire_20231111141537.vue new file mode 100644 index 0000000..5805f2b --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141537.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111141644.vue b/.history/src/components/DataAcquire_20231111141644.vue new file mode 100644 index 0000000..841ea30 --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141644.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111141703.vue b/.history/src/components/DataAcquire_20231111141703.vue new file mode 100644 index 0000000..7285ac0 --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141703.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111141726.vue b/.history/src/components/DataAcquire_20231111141726.vue new file mode 100644 index 0000000..94e801b --- /dev/null +++ b/.history/src/components/DataAcquire_20231111141726.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/.history/src/components/DataAcquire_20231111143404.vue b/.history/src/components/DataAcquire_20231111143404.vue new file mode 100644 index 0000000..dea1b1b --- /dev/null +++ b/.history/src/components/DataAcquire_20231111143404.vue @@ -0,0 +1,213 @@ + + + + + diff --git a/.history/src/components/DataAcquisition_20231111141312.vue b/.history/src/components/DataAcquisition_20231111141312.vue new file mode 100644 index 0000000..128e3f2 --- /dev/null +++ b/.history/src/components/DataAcquisition_20231111141312.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/.history/src/components/DataAcquisition_20231111141336.vue b/.history/src/components/DataAcquisition_20231111141336.vue new file mode 100644 index 0000000..128e3f2 --- /dev/null +++ b/.history/src/components/DataAcquisition_20231111141336.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/.history/src/components/DataAcquisition_20231111143359.vue b/.history/src/components/DataAcquisition_20231111143359.vue new file mode 100644 index 0000000..dbc3c73 --- /dev/null +++ b/.history/src/components/DataAcquisition_20231111143359.vue @@ -0,0 +1,218 @@ + + + + + diff --git a/.history/src/components/DataView_20231111143411.vue b/.history/src/components/DataView_20231111143411.vue new file mode 100644 index 0000000..79db140 --- /dev/null +++ b/.history/src/components/DataView_20231111143411.vue @@ -0,0 +1,799 @@ + + + + + + diff --git a/.history/src/components/DeviceVIew_20231111143421.vue b/.history/src/components/DeviceVIew_20231111143421.vue new file mode 100644 index 0000000..6904150 --- /dev/null +++ b/.history/src/components/DeviceVIew_20231111143421.vue @@ -0,0 +1,495 @@ + + + + + + diff --git a/.history/src/components/DeviceWirle_20231111143454.vue b/.history/src/components/DeviceWirle_20231111143454.vue new file mode 100644 index 0000000..b4f143f --- /dev/null +++ b/.history/src/components/DeviceWirle_20231111143454.vue @@ -0,0 +1,528 @@ + + + + + + diff --git a/.history/src/components/DeviceWirle_20231111144101.vue b/.history/src/components/DeviceWirle_20231111144101.vue new file mode 100644 index 0000000..dfff18e --- /dev/null +++ b/.history/src/components/DeviceWirle_20231111144101.vue @@ -0,0 +1,529 @@ + + + + + + diff --git a/.history/src/components/GateWay_20231111143511.vue b/.history/src/components/GateWay_20231111143511.vue new file mode 100644 index 0000000..d0b9650 --- /dev/null +++ b/.history/src/components/GateWay_20231111143511.vue @@ -0,0 +1,646 @@ + + + + + + diff --git a/.history/src/components/SerialPort_20231111140527.vue b/.history/src/components/SerialPort_20231111140527.vue new file mode 100644 index 0000000..4a2dedf --- /dev/null +++ b/.history/src/components/SerialPort_20231111140527.vue @@ -0,0 +1,1336 @@ + + + + + + diff --git a/.history/src/components/SerialPort_20231111143923.vue b/.history/src/components/SerialPort_20231111143923.vue new file mode 100644 index 0000000..b70b279 --- /dev/null +++ b/.history/src/components/SerialPort_20231111143923.vue @@ -0,0 +1,1336 @@ + + + + + + diff --git a/.history/src/components/SerialPort_20231111144027.vue b/.history/src/components/SerialPort_20231111144027.vue new file mode 100644 index 0000000..f68b132 --- /dev/null +++ b/.history/src/components/SerialPort_20231111144027.vue @@ -0,0 +1,1337 @@ + + + + + + diff --git a/.history/src/components/TreeView_20231111143535.vue b/.history/src/components/TreeView_20231111143535.vue new file mode 100644 index 0000000..4f43ec1 --- /dev/null +++ b/.history/src/components/TreeView_20231111143535.vue @@ -0,0 +1,822 @@ + + + + + + diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue index 73429cf..985b6f6 100644 --- a/src/components/ChiClone.vue +++ b/src/components/ChiClone.vue @@ -643,7 +643,7 @@ export default { sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas)); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } @@ -869,6 +869,7 @@ export default { line-height: 0px !important; } } + .mqtt { margin-left: 20px; } diff --git a/src/components/ChiClonewifi.vue b/src/components/ChiClonewifi.vue index 4444398..ca06a95 100644 --- a/src/components/ChiClonewifi.vue +++ b/src/components/ChiClonewifi.vue @@ -640,7 +640,7 @@ export default { }); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiCollection.vue b/src/components/ChiCollection.vue index 5df7d23..8eae0d2 100644 --- a/src/components/ChiCollection.vue +++ b/src/components/ChiCollection.vue @@ -587,7 +587,7 @@ export default { sessionStorage.setItem("CHGYWG_yx", JSON.stringify(datas)); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiCollectionwifi.vue b/src/components/ChiCollectionwifi.vue index 00a79f4..50b6f26 100644 --- a/src/components/ChiCollectionwifi.vue +++ b/src/components/ChiCollectionwifi.vue @@ -585,7 +585,7 @@ export default { sessionStorage.setItem("CHGYWG_wx", JSON.stringify(datas)); }else{ this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiDevice.vue b/src/components/ChiDevice.vue index 0c3d4e8..5f07c16 100644 --- a/src/components/ChiDevice.vue +++ b/src/components/ChiDevice.vue @@ -566,7 +566,7 @@ export default { this.$router.push(`/collectionpoint?user_id=${this.user_id}`) } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiDevicewifi.vue b/src/components/ChiDevicewifi.vue index 7575b2c..73882da 100644 --- a/src/components/ChiDevicewifi.vue +++ b/src/components/ChiDevicewifi.vue @@ -553,7 +553,7 @@ export default { this.$router.push(`/chiwificollect?user_id=${this.user_id}`) } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue index 4319b77..ed0fc69 100644 --- a/src/components/ChiGate.vue +++ b/src/components/ChiGate.vue @@ -163,7 +163,7 @@ export default { sessionStorage.setItem("CHGYWG_wx", JSON.stringify(datas)); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiGateway.vue b/src/components/ChiGateway.vue index 0778ad7..2fcf21e 100644 --- a/src/components/ChiGateway.vue +++ b/src/components/ChiGateway.vue @@ -136,7 +136,7 @@ export default { this.$router.push(`/configuration?user_id=${this.user_id}`); }else{ this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiGatewifi.vue b/src/components/ChiGatewifi.vue index 5903726..113c249 100644 --- a/src/components/ChiGatewifi.vue +++ b/src/components/ChiGatewifi.vue @@ -138,7 +138,7 @@ export default { this.$router.push(`/chiwifidevice?user_id=${this.user_id}`); }else{ this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/ChiWireld.vue b/src/components/ChiWireld.vue index 6f3c62c..3404fea 100644 --- a/src/components/ChiWireld.vue +++ b/src/components/ChiWireld.vue @@ -413,7 +413,7 @@ export default { sessionStorage.setItem("CHGYWG_yx", JSON.stringify(this.formData)); }else{ this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/CloneView.vue b/src/components/CloneView.vue index 8952629..08f8b1b 100644 --- a/src/components/CloneView.vue +++ b/src/components/CloneView.vue @@ -627,7 +627,7 @@ export default { sessionStorage.setItem("DB-IotLite_yx", JSON.stringify(datas)); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue index 2e30d17..2aa6618 100644 --- a/src/components/CloneWifi.vue +++ b/src/components/CloneWifi.vue @@ -627,7 +627,7 @@ export default { }); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/CollectionView.vue b/src/components/CollectionView.vue index 98b080b..02a4452 100644 --- a/src/components/CollectionView.vue +++ b/src/components/CollectionView.vue @@ -564,7 +564,7 @@ export default { console.log(this.tableData); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/CollectionWifi.vue b/src/components/CollectionWifi.vue index e83006d..a9fb006 100644 --- a/src/components/CollectionWifi.vue +++ b/src/components/CollectionWifi.vue @@ -515,7 +515,7 @@ export default { console.log(this.tableData); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/DataAcquire.vue b/src/components/DataAcquire.vue index 982b3a9..dea1b1b 100644 --- a/src/components/DataAcquire.vue +++ b/src/components/DataAcquire.vue @@ -143,6 +143,7 @@ export default { mark: "DB-IotLite_wx", user_id: this.user_id, mark_value: JSON.stringify(this.formdata), + step:"1", }); if (res.data.state) { this.$message({ @@ -150,10 +151,10 @@ export default { type: "success", }); sessionStorage.setItem("DB-IotLite_wx", JSON.stringify(this.formdata)); - this.$router.replace(`/channelconfig?user_id=${this.user_id}`); + this.$router.replace(`/dbcollectserial?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } @@ -168,13 +169,21 @@ export default { }); this.loading = false; if (res2.data.data && res2.data.state) { - console.log(res2); - let res3 = JSON.parse(res2.data.data.mark_value); - if (res3.wgpz_wgid) { - this.formData.wgpz_wgid = res3.wgpz_wgid; - console.log(this.formData.wgpz_wgid); - this.formData.wgpz_wgmc = res3.wgpz_wgmc; - this.formData.wgpz_wglx = res3.wgpz_wglx; + if (res2.data.data.step == 1) { + this.$router.push(`/dbcollectserial?user_id=${this.user_id}`) + } else if (res2.data.data.step == 2) { + this.$router.push(`/dbserialdevice?user_id=${this.user_id}`) + } else if (res2.data.data.step == 3) { + this.$router.push(`/chiwificollect?user_id=${this.user_id}`) + } else { + console.log(res2); + let res3 = JSON.parse(res2.data.data.mark_value); + if (res3.wgpz_wgid) { + this.formData.wgpz_wgid = res3.wgpz_wgid; + console.log(this.formData.wgpz_wgid); + this.formData.wgpz_wgmc = res3.wgpz_wgmc; + this.formData.wgpz_wglx = res3.wgpz_wglx; + } } } }, diff --git a/src/components/DataAcquisition.vue b/src/components/DataAcquisition.vue index cb98b49..dbc3c73 100644 --- a/src/components/DataAcquisition.vue +++ b/src/components/DataAcquisition.vue @@ -155,7 +155,7 @@ export default { this.$router.push(`/channelconfig?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } @@ -172,15 +172,15 @@ export default { this.loading = false; console.log(res2); // console.log(res2.data.data.step); - if (res2.data.data.step == 1) { - this.$router.push(`/channelconfig?user_id=${this.user_id}`) - } else if (res2.data.data.step == 2) { - this.$router.push(`/dbcollectdevice?user_id=${this.user_id}`) - } else if (res2.data.data.step == 3) { - this.$router.push(`/dbcollect?user_id=${this.user_id}`) - } else { - if (res2.data.data && res2.data.state) { + if (res2.data.data && res2.data.state) { + if (res2.data.data.step == 1) { + this.$router.push(`/channelconfig?user_id=${this.user_id}`) + } else if (res2.data.data.step == 2) { + this.$router.push(`/dbcollectdevice?user_id=${this.user_id}`) + } else if (res2.data.data.step == 3) { + this.$router.push(`/dbcollect?user_id=${this.user_id}`) + } else { console.log(res2.data.data.mark_value); let res3 = JSON.parse(res2.data.data.mark_value); if (res3.wgpz_wgid) { diff --git a/src/components/DataView.vue b/src/components/DataView.vue index 4e742da..79db140 100644 --- a/src/components/DataView.vue +++ b/src/components/DataView.vue @@ -631,7 +631,7 @@ export default { }); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/DeviceVIew.vue b/src/components/DeviceVIew.vue index db16729..6904150 100644 --- a/src/components/DeviceVIew.vue +++ b/src/components/DeviceVIew.vue @@ -317,7 +317,7 @@ export default { this.$router.push(`/dbcollect?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/DeviceWirle.vue b/src/components/DeviceWirle.vue index a6948a6..dfff18e 100644 --- a/src/components/DeviceWirle.vue +++ b/src/components/DeviceWirle.vue @@ -297,6 +297,7 @@ export default { mark: "DB-IotLite_wx", user_id: this.user_id, mark_value: JSON.stringify(datas), + step:"3", }); if (res.data.state) { this.$message({ @@ -315,7 +316,7 @@ export default { this.$router.push(`/dbwificollect?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/GateWay.vue b/src/components/GateWay.vue index 7603897..d0b9650 100644 --- a/src/components/GateWay.vue +++ b/src/components/GateWay.vue @@ -470,7 +470,7 @@ export default { }); }else{ this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/SerialPort.vue b/src/components/SerialPort.vue index 4a2dedf..f68b132 100644 --- a/src/components/SerialPort.vue +++ b/src/components/SerialPort.vue @@ -858,6 +858,7 @@ export default { mark: "DB-IotLite_wx", user_id: this.user_id, mark_value: JSON.stringify(datas), + step:"2", }); if (res.data.state) { this.$message({ @@ -1088,7 +1089,7 @@ export default { this.$router.push(`/dbserialdevice?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); } diff --git a/src/components/TreeView.vue b/src/components/TreeView.vue index 41d7c51..4f43ec1 100644 --- a/src/components/TreeView.vue +++ b/src/components/TreeView.vue @@ -567,7 +567,7 @@ export default { this.$router.push(`/dbcollectdevice?user_id=${this.user_id}`); } else { this.$message({ - message: "保存失败", + message: `保存失败,原因是${res.data.message}`, type: "error", }); }