|
|
|
@ -242,7 +242,32 @@
|
|
|
|
|
<div class="tabsBox">
|
|
|
|
|
<el-tabs v-model="tabsActive" type="card" @tab-click="idhandleClick">
|
|
|
|
|
<el-tab-pane label="查询实际参数" name="first">
|
|
|
|
|
<div class="queryParam">
|
|
|
|
|
<div class="queryParam" v-if="rowData.protocol == '65284'">
|
|
|
|
|
<el-form
|
|
|
|
|
:model="zjidParameter"
|
|
|
|
|
label-position="right"
|
|
|
|
|
label-width="124px"
|
|
|
|
|
>
|
|
|
|
|
<el-form-item label="杆塔ID">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="zjidParameter.componentId"
|
|
|
|
|
disabled="disabled"
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="idSearch"
|
|
|
|
|
:loading="idLoading"
|
|
|
|
|
>查询</el-button
|
|
|
|
|
>
|
|
|
|
|
<p class="looktime" v-if="lookTime && showLookTime">
|
|
|
|
|
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }}
|
|
|
|
|
</p>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="queryParam" v-else>
|
|
|
|
|
<el-form
|
|
|
|
|
:model="idParameter"
|
|
|
|
|
label-position="right"
|
|
|
|
@ -281,7 +306,47 @@
|
|
|
|
|
</div>
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
<el-tab-pane label="设置参数" name="second">
|
|
|
|
|
<div class="queryParam">
|
|
|
|
|
<div class="queryParam" v-if="rowData.protocol == '65284'">
|
|
|
|
|
<el-form
|
|
|
|
|
:model="zjidParameter"
|
|
|
|
|
label-position="right"
|
|
|
|
|
label-width="124px"
|
|
|
|
|
ref="idParameterref"
|
|
|
|
|
:rules="zjidrules"
|
|
|
|
|
>
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="zjvalue"
|
|
|
|
|
placeholder="请选择"
|
|
|
|
|
@change="zjchange"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in zjoptions"
|
|
|
|
|
:key="item.value"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:value="item.value"
|
|
|
|
|
>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="杆塔ID" prop="componentId" v-if="idFlag">
|
|
|
|
|
<el-input v-model="zjidParameter.componentId"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="CMD_ID" prop="newCmdId" v-else>
|
|
|
|
|
<el-input v-model="zjidParameter.newCmdId"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="idSet"
|
|
|
|
|
:loading="idSetLoading"
|
|
|
|
|
>设置</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="queryParam" v-else>
|
|
|
|
|
<el-form
|
|
|
|
|
:model="idParameter"
|
|
|
|
|
label-position="right"
|
|
|
|
@ -793,7 +858,33 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
upperLoading: false,
|
|
|
|
|
upperSetLoading: false,
|
|
|
|
|
|
|
|
|
|
//浙江id参数
|
|
|
|
|
zjvalue: 1,
|
|
|
|
|
zjoptions: [
|
|
|
|
|
{
|
|
|
|
|
value: 1,
|
|
|
|
|
label: "杆塔ID",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
value: 2,
|
|
|
|
|
label: "CMD_ID",
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
idFlag: true,
|
|
|
|
|
zjidParameter: {
|
|
|
|
|
newCmdId: "",
|
|
|
|
|
componentId: "",
|
|
|
|
|
},
|
|
|
|
|
zjidrules: {
|
|
|
|
|
// newCmdId: [
|
|
|
|
|
// { required: true, message: "请输入CMD_ID", trigger: "blur" },
|
|
|
|
|
// { validator: validCmid, trigger: "blur" },
|
|
|
|
|
// ],
|
|
|
|
|
// componentId: [
|
|
|
|
|
// { required: true, message: "请输入杆塔ID", trigger: "blur" },
|
|
|
|
|
// { validator: validCmid, trigger: "blur" },
|
|
|
|
|
// ],
|
|
|
|
|
},
|
|
|
|
|
//id参数
|
|
|
|
|
idParameter: {
|
|
|
|
|
newCmdId: "",
|
|
|
|
@ -1000,6 +1091,7 @@ export default {
|
|
|
|
|
//id重置数据
|
|
|
|
|
idhandleClick() {
|
|
|
|
|
this.idParameter = {};
|
|
|
|
|
this.zjidParameter = {};
|
|
|
|
|
this.lookTime = "";
|
|
|
|
|
clearInterval(this.timer);
|
|
|
|
|
this.i = 0;
|
|
|
|
@ -1207,6 +1299,17 @@ export default {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
//浙江change
|
|
|
|
|
zjchange(val) {
|
|
|
|
|
console.log(val);
|
|
|
|
|
if (val == 1) {
|
|
|
|
|
console.log("杆塔id");
|
|
|
|
|
this.idFlag = true;
|
|
|
|
|
} else {
|
|
|
|
|
console.log("cmdid");
|
|
|
|
|
this.idFlag = false;
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
//id参数查询
|
|
|
|
|
// --act=termid [0xAC] --flag=[Request Set Flag, default is set=1, 0: request] --newcmdid=[New CMD ID] --compid=[Component Id] --orgid=[Original Id]
|
|
|
|
|
idSearch() {
|
|
|
|
@ -1225,7 +1328,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "rf",
|
|
|
|
|
value: 2,
|
|
|
|
|
value: 1,
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: "newcmdid",
|
|
|
|
@ -1285,33 +1388,86 @@ export default {
|
|
|
|
|
this.$refs.idParameterref.validate((valid) => {
|
|
|
|
|
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 = {};
|
|
|
|
|