ly.fan
/
xy-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加osd

Browse Source
ds1.0
fanluyan 2 years ago
parent c46203b0c1
commit 82f60a0fa9
1 changed files with 141 additions and 52 deletions
Show Stats Download Patch File Download Diff File

193
src/views/photographicDevice/components/parameterSetDialog.vue
Unescape Escape View File

@ -401,7 +401,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="OSD参数" name="11"> <el-tab-pane label="OSD参数" name="11">
<div class="tabsBox"> <div class="tabsBox">
<el-tabs v-model="tabsActive" type="card" @tab-click="uphandleClick"> <el-tabs v-model="tabsActive" type="card" @tab-click="osdhandleClick">
<el-tab-pane label="查询实际参数" name="first"> <el-tab-pane label="查询实际参数" name="first">
<div class="queryParam osdParam"> <div class="queryParam osdParam">
<div class="channelBox"> <div class="channelBox">
@ -434,48 +434,39 @@
label-position="right" label-position="right"
label-width="124px" label-width="124px"
> >
<el-form-item label="预置位"> <el-form-item label="时间标识" prop="showTime">
<el-input
v-model="osdParams.preset"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item label="时间标识" prop="timeMark">
<el-select <el-select
v-model="osdParams.timeMark" v-model="osdParams.showTime"
placeholder="请选择"
class="mr20" class="mr20"
:disabled="true" :disabled="true"
> >
<el-option <el-option
v-for="item in timelist" v-for="item in timelist"
:key="item.id" :key="item.id"
:label="item.id + ' (' + item.name + ')'" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="文本标识" prop="textMark"> <el-form-item label="文本标识" prop="showText">
<el-select <el-select
v-model="osdParams.textMark" v-model="osdParams.showText"
placeholder="请选择"
class="mr20" class="mr20"
:disabled="true" :disabled="true"
> >
<el-option <el-option
v-for="item in textlist" v-for="item in timelist"
:key="item.id" :key="item.id"
:label="item.id + ' (' + item.name + ')'" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="文本内容" prop="textInfo"> <el-form-item label="文本内容" prop="textContent">
<el-input <el-input
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入内容" v-model="osdParams.textContent"
v-model="osdParams.textarea"
:disabled="true" :disabled="true"
> >
</el-input> </el-input>
@ -523,46 +514,32 @@
label-position="right" label-position="right"
label-width="124px" label-width="124px"
> >
<el-form-item label="预置位"> <el-form-item label="时间标识" prop="showTime">
<el-input <el-select v-model="osdParams.showTime" class="mr20">
v-model="osdParams.preset"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item label="时间标识" prop="timeMark">
<el-select
v-model="osdParams.timeMark"
placeholder="请选择"
class="mr20"
>
<el-option <el-option
v-for="item in timelist" v-for="item in timelist"
:key="item.id" :key="item.id"
:label="item.id + ' (' + item.name + ')'" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="文本标识" prop="textMark"> <el-form-item label="文本标识" prop="showText">
<el-select <el-select v-model="osdParams.showText" class="mr20">
v-model="osdParams.textMark"
placeholder="请选择"
class="mr20"
>
<el-option <el-option
v-for="item in textlist" v-for="item in timelist"
:key="item.id" :key="item.id"
:label="item.id + ' (' + item.name + ')'" :label="item.name"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="文本内容" prop="textInfo"> <el-form-item label="文本内容" prop="textContent">
<el-input <el-input
type="textarea" type="textarea"
:rows="3" :rows="3"
placeholder="请输入内容" placeholder="请输入内容"
v-model="osdParams.textarea" v-model="osdParams.textContent"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -786,8 +763,26 @@ export default {
waterForm: {}, waterForm: {},
//osd参数 //osd参数
osdParams: {}, osdParams: {},
textlist: [], textlist: [
timelist: [], {
name: "显示",
id: 1,
},
{
name: "不显示",
id: 0,
},
],
timelist: [
{
name: "显示",
id: 1,
},
{
name: "不显示",
id: 0,
},
],
osdLoading: false, osdLoading: false,
osdSetLoading: false, osdSetLoading: false,
accesslist: [], //通道选择器 accesslist: [], //通道选择器
@ -851,23 +846,30 @@ export default {
//采样参数重置数据 //采样参数重置数据
samphandleClick() { samphandleClick() {
this.samplingForm = {}; this.samplingForm = {};
clearInterval(this.timer);
this.i = 0; this.i = 0;
this.timer = null; this.timer = null;
clearInterval(this.timer);
}, },
//上位机重置数据 //上位机重置数据
uphandleClick() { uphandleClick() {
this.upperComputer = {}; this.upperComputer = {};
clearInterval(this.timer);
this.i = 0; this.i = 0;
this.timer = null; this.timer = null;
clearInterval(this.timer);
}, },
//id重置数据 //id重置数据
idhandleClick() { idhandleClick() {
this.idParameter = {}; this.idParameter = {};
clearInterval(this.timer);
this.i = 0; this.i = 0;
this.timer = null; this.timer = null;
},
//osd重置
osdhandleClick() {
this.osdParams = {};
clearInterval(this.timer); clearInterval(this.timer);
this.i = 0;
this.timer = null;
}, },
//采样参数查询 //采样参数查询
// -act=sampling [0xA4 ] --flag=[Request Set Flag, default is set=1, 0: request] --rf=[Request Flag] --reqtype=[Request Type] --maintime=[Main Time] --samplecount=[Sample Count] --samplingfreq=[Sample Frequency] --heartbeat=[Heartbeat Time] // -act=sampling [0xA4 ] --flag=[Request Set Flag, default is set=1, 0: request] --rf=[Request Flag] --reqtype=[Request Type] --maintime=[Main Time] --samplecount=[Sample Count] --samplingfreq=[Sample Frequency] --heartbeat=[Heartbeat Time]
@ -1184,7 +1186,7 @@ export default {
}, },
{ {
name: "flag", name: "flag",
value: 1, value: 0,
}, },
{ {
@ -1213,10 +1215,9 @@ export default {
waterhandleClick() { waterhandleClick() {
this.waterForm = {}; this.waterForm = {};
this.channelId = 1; this.channelId = 1;
clearInterval(this.timer);
this.i = 0; this.i = 0;
this.timer = null; this.timer = null;
clearInterval(this.timer);
}, },
clearform() { clearform() {
console.log("清除其他数据"); console.log("清除其他数据");
@ -1225,8 +1226,86 @@ export default {
this.waterSetLoading = false; this.waterSetLoading = false;
}, },
//查询设置osd //查询设置osd
osdSearch() {}, osdSearch() {
osdSet() {}, if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
this.osdLoading = true;
let params = [
{
name: "act",
value: "osd",
},
{
name: "flag",
value: 0,
},
{
name: "channel",
value: this.channelId,
},
{
name: "showTime",
value: "",
},
{
name: "showText",
value: "",
},
{
name: "text",
value: "",
},
];
this.setTermFn(params);
} else {
this.$message({
duration: 1500,
showClose: true,
message: "装置下线，发送指令失败",
type: "error",
});
}
},
osdSet() {
if (this.rowData.isonline || this.rowData.onlinestatus === 1) {
this.osdSetLoading = true;
let params = [
{
name: "act",
value: "osd",
},
{
name: "flag",
value: 1,
},
{
name: "channel",
value: this.channelId,
},
{
name: "showTime",
value: this.osdParams.showTime,
},
{
name: "showText",
value: this.osdParams.showText,
},
{
name: "text",
value: this.osdParams.textContent,
},
];
this.setTermFn(params);
} else {
this.$message({
duration: 1500,
showClose: true,
message: "装置下线，发送指令失败",
type: "error",
});
}
},
//装置状态报 //装置状态报
//--act=runningstatus [0xEA] --cmdid=[CMD_ID] //--act=runningstatus [0xEA] --cmdid=[CMD_ID]
runstatusSearch() { runstatusSearch() {
@ -1288,6 +1367,8 @@ export default {
this.statusLoading = false; this.statusLoading = false;
this.waterLoading = false; this.waterLoading = false;
this.waterSetLoading = false; this.waterSetLoading = false;
this.osdLoading = false;
this.osdSetLoading = false;
console.log("终止轮询"); console.log("终止轮询");
// && res.data.result == 255 // && res.data.result == 255
console.log(JSON.parse(res.data.data)); console.log(JSON.parse(res.data.data));
@ -1297,6 +1378,7 @@ export default {
//修改cmdid //修改cmdid
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);
console.log(this.tabName); console.log(this.tabName);
if (this.tabName == "上位机信息") { if (this.tabName == "上位机信息") {
let hexArray = this.upperComputer.ip let hexArray = this.upperComputer.ip
@ -1339,6 +1421,8 @@ export default {
this.statusLoading = false; this.statusLoading = false;
this.waterLoading = false; this.waterLoading = false;
this.waterSetLoading = false; this.waterSetLoading = false;
this.osdLoading = false;
this.osdSetLoading = false;
} }
}) })
.catch((err) => {}); .catch((err) => {});
@ -1418,11 +1502,13 @@ export default {
this.idParameter = {}; this.idParameter = {};
this.gpsForm = {}; this.gpsForm = {};
this.waterForm = {}; this.waterForm = {};
this.osdParams = {};
this.channelId = 1; this.channelId = 1;
this.i = 0; this.i = 0;
clearInterval(this.timer); clearInterval(this.timer);
this.timer = null; this.timer = null;
this.osdLoading = false;
this.osdSetLoading = false;
this.sampLoading = false; this.sampLoading = false;
this.sampSetLoading = false; this.sampSetLoading = false;
this.upperLoading = false; this.upperLoading = false;
@ -1521,6 +1607,9 @@ export default {
padding: 0 12px 0 0; padding: 0 12px 0 0;
} }
} }
.el-textarea .el-textarea__inner {
font-family: none;
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save