+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设置
+
+
+
+
{
if (valid) {
this.idSetLoading = true;
- let params = [
- {
- name: "act",
- value: "termid",
- },
- {
- name: "flag",
- value: 1,
- },
- {
- name: "rf",
- value: 255,
- },
- {
- name: "newcmdid",
- value: this.idParameter.newCmdId,
- },
- {
- name: "compid",
- value: this.idParameter.componentId,
- },
- {
- name: "orgid",
- value: this.idParameter.originalId,
- },
- ];
- this.setTermFn(params);
+ if (this.rowData.protocol == 65284) {
+ if (this.zjvalue == 1) {
+ let params = [
+ {
+ name: "act",
+ value: "termid",
+ },
+ {
+ name: "flag",
+ value: 1,
+ },
+ {
+ name: "rf",
+ value: 2,
+ },
+ // {
+ // name: "newcmdid",
+ // value: this.idParameter.newCmdId,
+ // },
+ {
+ name: "compid",
+ value: this.zjidParameter.componentId,
+ },
+ ];
+ this.setTermFn(params);
+ } else {
+ let params = [
+ {
+ name: "act",
+ value: "termid",
+ },
+ {
+ name: "flag",
+ value: 1,
+ },
+ {
+ name: "rf",
+ value: 1,
+ },
+ {
+ name: "newcmdid",
+ value: this.zjidParameter.newCmdId,
+ },
+ // {
+ // name: "compid",
+ // value: this.idParameter.componentId,
+ // },
+ ];
+ this.setTermFn(params);
+ }
+ } else {
+ let params = [
+ {
+ name: "act",
+ value: "termid",
+ },
+ {
+ name: "flag",
+ value: 1,
+ },
+ {
+ name: "rf",
+ value: 255,
+ },
+ {
+ name: "newcmdid",
+ value: this.idParameter.newCmdId,
+ },
+ {
+ name: "compid",
+ value: this.idParameter.componentId,
+ },
+ {
+ name: "orgid",
+ value: this.idParameter.originalId,
+ },
+ ];
+
+ this.setTermFn(params);
+ }
} else {
console.log("error submit!!");
return false;
@@ -1589,24 +1745,25 @@ export default {
this.idParameter = JSON.parse(res.data.data);
this.waterForm = JSON.parse(res.data.data);
this.osdParams = JSON.parse(res.data.data);
+ this.zjidParameter = JSON.parse(res.data.data);
if (this.osdParams.textContent == "null ") {
console.log("我是空");
this.osdParams.textContent = "";
}
if (this.tabName == "上位机信息") {
- let hexArray = this.upperComputer.ip
- .toString(16)
- .match(/.{1,2}/g)
- .reverse();
- console.log(hexArray);
- for (let j = 0; j < hexArray.length; j++) {
- console.log(hexArray[j]);
- console.log(parseInt(hexArray[j], 16));
- hexArray[j] = parseInt(hexArray[j], 16);
- }
- console.log(hexArray);
- this.upperComputer.ip = hexArray.join(".");
+ // let hexArray = this.upperComputer.ip
+ // .toString(16)
+ // .match(/.{1,2}/g)
+ // .reverse();
+ // console.log(hexArray);
+ // for (let j = 0; j < hexArray.length; j++) {
+ // console.log(hexArray[j]);
+ // console.log(parseInt(hexArray[j], 16));
+ // hexArray[j] = parseInt(hexArray[j], 16);
+ // }
+ // console.log(hexArray);
+ this.upperComputer.ip = this.upperComputer.ipStr;
//ip地址解析结束
console.log(this.idParameter);
}
@@ -1717,9 +1874,10 @@ export default {
this.activeName = "1";
this.tabsActive = "first";
this.samplingForm = {};
-
+ this.deviceTimeForm = {};
this.upperComputer = {};
this.idParameter = {};
+ this.zjidParameter = {};
this.gpsForm = {};
this.waterForm = {};
this.osdParams = {};