role1.0
fanluyan 1 year ago
commit 205574e9b6

@ -31,7 +31,7 @@
>
<el-form-item label="装置时间">
<el-date-picker
v-model="deviceTimeForm.zztime"
v-model="devicetime"
type="datetime"
placeholder="查询日期时间"
value-format="timestamp"
@ -46,7 +46,7 @@
<el-form-item label="新装置时间">
<!-- <el-input v-model="deviceTimeForm.newzztime"></el-input> -->
<el-date-picker
v-model="deviceTimeForm.newzztime"
v-model="devicenewtime"
type="datetime"
placeholder="选择日期时间"
value-format="timestamp"
@ -243,7 +243,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"
@ -282,7 +307,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"
@ -800,6 +865,8 @@ export default {
activeName: "1",
timeLoading: false,
timesetLoading: false,
devicenewtime: "",
devicetime: "",
deviceTimeForm: {
zztime: "", //
newzztime: "", //
@ -830,7 +897,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: "",
@ -953,7 +1046,14 @@ export default {
.catch((err) => {});
},
handleFocus() {
this.deviceTimeForm.newzztime = new Date();
if (
this.devicenewtime == "" ||
this.devicenewtime == undefined ||
this.devicenewtime == null
) {
this.devicenewtime = new Date();
console.log(this.devicenewtime);
}
},
//
searchTime() {
@ -984,8 +1084,12 @@ export default {
// .\bin\xympadmn.exe --server=127.0.0.1 --port=6891 --act=time --cmdid=XY-SIMULATOR-0015 --flag=1 --time=20230101122322
setTime() {
if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
console.log(this.deviceTimeForm.newzztime);
if (this.deviceTimeForm.newzztime !== "") {
console.log(this.devicenewtime);
if (
this.devicenewtime !== "" &&
this.devicenewtime !== undefined &&
this.devicenewtime !== null
) {
this.timesetLoading = true;
let params = [
{
@ -998,7 +1102,7 @@ export default {
},
{
name: "time",
value: this.deviceTimeForm.newzztime,
value: this.devicenewtime / 1000,
},
];
this.setTermFn(params);
@ -1040,6 +1144,7 @@ export default {
//id
idhandleClick() {
this.idParameter = {};
this.zjidParameter = {};
this.lookTime = "";
clearInterval(this.timer);
this.i = 0;
@ -1247,6 +1352,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() {
@ -1265,7 +1381,7 @@ export default {
},
{
name: "rf",
value: 2,
value: 1,
},
{
name: "newcmdid",
@ -1325,33 +1441,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;
@ -1617,12 +1786,10 @@ export default {
console.log(JSON.parse(res.data.data));
//
console.log(this.tabName);
this.deviceTimeForm = JSON.parse(res.data.data);
//this.devicenewtime = JSON.parse(res.data.data).timestamp * 1000;
if (this.tabName == "装置时间") {
this.showLookTime = true;
this.deviceTimeForm.zztime = this.deviceTimeForm.timestamp * 1000;
console.log(this.deviceTimeForm.zztime);
return;
this.devicetime = JSON.parse(res.data.data).timestamp * 1000;
console.log(this.devicetime);
}
//
this.samplingForm = JSON.parse(res.data.data);
@ -1632,6 +1799,7 @@ 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 = "";
@ -1800,10 +1968,11 @@ export default {
this.isShow = false;
this.activeName = "1";
this.tabsActive = "first";
this.deviceTimeForm = {};
this.samplingForm = {};
this.deviceTimeForm = {};
this.upperComputer = {};
this.idParameter = {};
this.zjidParameter = {};
this.gpsForm = {};
this.waterForm = {};
this.osdParams = {};

Loading…
Cancel
Save