wp1.0
fanluyan 1 year ago
parent c2797030dc
commit 8ffb77634f

@ -242,7 +242,32 @@
<div class="tabsBox"> <div class="tabsBox">
<el-tabs v-model="tabsActive" type="card" @tab-click="idhandleClick"> <el-tabs v-model="tabsActive" type="card" @tab-click="idhandleClick">
<el-tab-pane label="查询实际参数" name="first"> <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 <el-form
:model="idParameter" :model="idParameter"
label-position="right" label-position="right"
@ -281,7 +306,47 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设置参数" name="second"> <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 <el-form
:model="idParameter" :model="idParameter"
label-position="right" label-position="right"
@ -793,7 +858,33 @@ export default {
}, },
upperLoading: false, upperLoading: false,
upperSetLoading: 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 //id
idParameter: { idParameter: {
newCmdId: "", newCmdId: "",
@ -1000,6 +1091,7 @@ export default {
//id //id
idhandleClick() { idhandleClick() {
this.idParameter = {}; this.idParameter = {};
this.zjidParameter = {};
this.lookTime = ""; this.lookTime = "";
clearInterval(this.timer); clearInterval(this.timer);
this.i = 0; 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 //id
// --act=termid [0xAC] --flag=[Request Set Flag, default is set=1, 0: request] --newcmdid=[New CMD ID] --compid=[Component Id] --orgid=[Original 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() { idSearch() {
@ -1225,7 +1328,7 @@ export default {
}, },
{ {
name: "rf", name: "rf",
value: 2, value: 1,
}, },
{ {
name: "newcmdid", name: "newcmdid",
@ -1285,6 +1388,57 @@ export default {
this.$refs.idParameterref.validate((valid) => { this.$refs.idParameterref.validate((valid) => {
if (valid) { if (valid) {
this.idSetLoading = true; this.idSetLoading = true;
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 = [ let params = [
{ {
name: "act", name: "act",
@ -1311,7 +1465,9 @@ export default {
value: this.idParameter.originalId, value: this.idParameter.originalId,
}, },
]; ];
this.setTermFn(params); this.setTermFn(params);
}
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
@ -1589,24 +1745,25 @@ export default {
this.idParameter = JSON.parse(res.data.data); this.idParameter = JSON.parse(res.data.data);
this.waterForm = JSON.parse(res.data.data); this.waterForm = JSON.parse(res.data.data);
this.osdParams = JSON.parse(res.data.data); this.osdParams = JSON.parse(res.data.data);
this.zjidParameter = JSON.parse(res.data.data);
if (this.osdParams.textContent == "null ") { if (this.osdParams.textContent == "null ") {
console.log("我是空"); console.log("我是空");
this.osdParams.textContent = ""; this.osdParams.textContent = "";
} }
if (this.tabName == "上位机信息") { if (this.tabName == "上位机信息") {
let hexArray = this.upperComputer.ip // let hexArray = this.upperComputer.ip
.toString(16) // .toString(16)
.match(/.{1,2}/g) // .match(/.{1,2}/g)
.reverse(); // .reverse();
console.log(hexArray); // console.log(hexArray);
for (let j = 0; j < hexArray.length; j++) { // for (let j = 0; j < hexArray.length; j++) {
console.log(hexArray[j]); // console.log(hexArray[j]);
console.log(parseInt(hexArray[j], 16)); // console.log(parseInt(hexArray[j], 16));
hexArray[j] = parseInt(hexArray[j], 16); // hexArray[j] = parseInt(hexArray[j], 16);
} // }
console.log(hexArray); // console.log(hexArray);
this.upperComputer.ip = hexArray.join("."); this.upperComputer.ip = this.upperComputer.ipStr;
//ip //ip
console.log(this.idParameter); console.log(this.idParameter);
} }
@ -1717,9 +1874,10 @@ export default {
this.activeName = "1"; this.activeName = "1";
this.tabsActive = "first"; this.tabsActive = "first";
this.samplingForm = {}; this.samplingForm = {};
this.deviceTimeForm = {};
this.upperComputer = {}; this.upperComputer = {};
this.idParameter = {}; this.idParameter = {};
this.zjidParameter = {};
this.gpsForm = {}; this.gpsForm = {};
this.waterForm = {}; this.waterForm = {};
this.osdParams = {}; this.osdParams = {};

Loading…
Cancel
Save