diff --git a/src/components/ChiClone.vue b/src/components/ChiClone.vue index 354f195..e935676 100644 --- a/src/components/ChiClone.vue +++ b/src/components/ChiClone.vue @@ -288,7 +288,7 @@ export default { loading: false, user_id: "", formData: { - mqtt_qiyong: true, + mqtt_qiyong: false, mqtt_ip: "", mqtt_wgsn: "", mqtt_port: "", @@ -623,7 +623,7 @@ export default { // this.formData.mqtt_tls = String(Number(this.formData.mqtt_tls)); // this.formData.mqtt_clearsession = String(Number(this.formData.mqtt_clearsession)); var obj = { - mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)), + // mqtt_qiyong: String(Number(this.formData.mqtt_qiyong)), mqtt_ip: this.mqtt_ip1 + "." + @@ -666,9 +666,9 @@ export default { console.log(JSON.parse(data.data.mark_value)); let obj = JSON.parse(data.data.mark_value); if (obj.mqtt_ip) { - this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); - console.log(obj.mqtt_qiyong); - console.log(this.formData.mqtt_qiyong); + // this.formData.mqtt_qiyong = Boolean(Number(obj.mqtt_qiyong)); + // console.log(obj.mqtt_qiyong); + // console.log(this.formData.mqtt_qiyong); this.mqtt_ip1 = obj.mqtt_ip.split(".")[0]; this.mqtt_ip2 = obj.mqtt_ip.split(".")[1]; this.mqtt_ip3 = obj.mqtt_ip.split(".")[2]; diff --git a/src/components/ChiGate.vue b/src/components/ChiGate.vue index d351dff..c4ea207 100644 --- a/src/components/ChiGate.vue +++ b/src/components/ChiGate.vue @@ -1,8 +1,8 @@ +======= + + + + + + + + + + + + + + +
+ + + + + 保 存 + 取 消 + + +>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
diff --git a/src/components/CloneWifi.vue b/src/components/CloneWifi.vue index c7172c3..ff286ed 100644 --- a/src/components/CloneWifi.vue +++ b/src/components/CloneWifi.vue @@ -154,6 +154,7 @@ --> +<<<<<<< HEAD @@ -208,10 +209,53 @@
保存 + + + + + + + + + + + + + + + + + + + + + + +
+ 保 存 + 取 消 +
+ +
+
+
+ 保存 + +<<<<<<< HEAD
@@ -240,6 +284,43 @@ +======= +
+ + + + + + + + + + + + + +
+ + + + + 保 存 + 取 消 + + +>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26
@@ -388,6 +469,7 @@ export default { label: "Alink", }, { +<<<<<<< HEAD label: "Tlink", }, { @@ -397,6 +479,171 @@ export default { label: "Ulink", }, ], +======= + label: "IOT", + children: [ + { + label: "Mqtt Client" + }, + { + label: "Alink" + }, + { + label: "Tlink" + }, + { + label: "loTDDC" + }, + { + label: "Ulink" + }, + ] + } + ] + }], + defaultProps: { + children: 'children', + label: 'label' + }, + // 右边添加设备的字段 + options3: [ + { + label: "有线区精雕1", + value: "有线区精雕1", + }, + { + label: "无线区精雕1", + value: "无线区精雕1", + } + ], + options4: [{ + value: "MachinePamHID909", + label: "MachinePamHID909", + }, { + value: "MachinePamHID910", + label: "MachinePamHID910", + }, { + value: "MachinePamHID911", + label: "MachinePamHID911", + }, { + value: "MachinePamHID912", + label: "MachinePamHID912", + }, { + value: "MachinePamHID913", + label: "MachinePamHID913", + }, { + value: "MachinePamHID914", + label: "MachinePamHID914", + }, { + value: "MachinePamHID915", + label: "MachinePamHID915", + }, { + value: "MachinePamHID916", + label: "MachinePamHID916", + }, { + value: "MachinePamHID917", + label: "MachinePamHID917", + }, { + value: "MachinePamHID918", + label: "MachinePamHID918", + }, { + value: "MachinePamHID919", + label: "MachinePamHID919", + }, { + value: "MachinePamHID920", + label: "MachinePamHID920", + }, { + value: "MachinePamHID921", + label: "MachinePamHID921", + }, { + value: "MachinePamHID922", + label: "MachinePamHID922", + }, { + value: "MachinePamHID923", + label: "MachinePamHID923", + }, { + value: "MachinePamHID924", + label: "MachinePamHID924", + }, { + value: "MachinePamHID925", + label: "MachinePamHID925", + }, { + value: "MachinePamHID926", + label: "MachinePamHID926", + }, { + value: "MachinePamHID927", + label: "MachinePamHID927", + }, { + value: "MachinePamHID928", + label: "MachinePamHID928", + }, { + value: "MachinePamHID929", + label: "MachinePamHID929", + }, { + value: "MachinePamHID930", + label: "MachinePamHID930", + }, { + value: "MachinePamHID931", + label: "MachinePamHID931", + }, { + value: "MachinePamHID932", + label: "MachinePamHID932", + }, { + value: "MachinePamHID933", + label: "MachinePamHID933", + }, { + value: "MachinePamHID934", + label: "MachinePamHID934", + }, { + value: "MachinePamHID935", + label: "MachinePamHID935", + }, { + value: "MachinePamHID936", + label: "MachinePamHID936", + }, { + value: "MachinePamHID937", + label: "MachinePamHID937", + }, { + value: "MachinePamHID938", + label: "MachinePamHID938", + }], + tableData: [ + { + mqtt_cjd_sbmc: "无线区精雕1", + mqtt_cjd_tagid: "MachinePamHID909", + }, + ], + // 校验 + rules: { + mqtt_ip: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入服务器IP', trigger: 'blur' }, + ], + mqtt_port: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入端口', trigger: 'blur' }, + ], + mqtt_wgsn: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入网关ID', trigger: 'blur' }, + ], + mqtt_sssjfbzt: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入主题', trigger: 'blur' }, + ], + mqtt_scms: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入上传模式', trigger: 'blur' }, + ], + mqtt_sczq: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入上传周期', trigger: 'blur' }, + ], + mqtt_sjgl: [ + { required: true, message: '', trigger: 'blur' }, + // { required: true, message: '请输入数据过滤', trigger: 'blur' }, + ], +>>>>>>> 42cfd39927acf79f394e3a60cae81f6a32163f26 }, ], }, diff --git a/src/components/CollectionView.vue b/src/components/CollectionView.vue index 586714f..2341df6 100644 --- a/src/components/CollectionView.vue +++ b/src/components/CollectionView.vue @@ -87,13 +87,13 @@ - +