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 d8bb891ba2
commit c46203b0c1
2 changed files with 205 additions and 1 deletions
Show Stats Download Patch File Download Diff File

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

@ -282,7 +282,6 @@
<imageCapture ref="imageCaptureref" :rowdata="rowData"></imageCapture> <imageCapture ref="imageCaptureref" :rowdata="rowData"></imageCapture>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="视频采集参数" name="6"> <el-tab-pane label="视频采集参数" name="6">
<div class="tabsBox"> <div class="tabsBox">
<videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture> <videoCapture ref="videoCaptureref" :rowdata="rowData"></videoCapture>
@ -400,6 +399,187 @@
</el-tabs> </el-tabs>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="OSD参数" name="11">
<div class="tabsBox">
<el-tabs v-model="tabsActive" type="card" @tab-click="uphandleClick">
<el-tab-pane label="查询实际参数" name="first">
<div class="queryParam osdParam">
<div class="channelBox">
<span class="title">通道</span>
<el-select
v-model="channelId"
placeholder="请选择"
class="mr20"
>
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</div>
<el-form
:model="osdParams"
label-position="right"
label-width="124px"
>
<el-form-item label="预置位">
<el-input
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"
:disabled="true"
>
<el-option
v-for="item in timelist"
:key="item.id"
:label="item.id + ' (' + item.name + ')'"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本标识" prop="textMark">
<el-select
v-model="osdParams.textMark"
placeholder="请选择"
class="mr20"
:disabled="true"
>
<el-option
v-for="item in textlist"
:key="item.id"
:label="item.id + ' (' + item.name + ')'"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本内容" prop="textInfo">
<el-input
type="textarea"
:rows="3"
placeholder="请输入内容"
v-model="osdParams.textarea"
:disabled="true"
>
</el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="osdSearch"
:loading="osdLoading"
>查询</el-button
>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
<el-tab-pane label="设置参数" name="second">
<div class="queryParam osdParam">
<div class="channelBox">
<span class="title">通道</span>
<el-select
v-model="channelId"
placeholder="请选择"
class="mr20"
>
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="
item.alias !== null && item.alias !== ''
? item.alias
: item.channelname
"
:value="item.channelid"
>
{{
item.alias !== null && item.alias !== ""
? item.alias
: item.channelname
}}
</el-option>
</el-select>
</div>
<el-form
:model="osdParams"
label-position="right"
label-width="124px"
>
<el-form-item label="预置位">
<el-input
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
v-for="item in timelist"
:key="item.id"
:label="item.id + ' (' + item.name + ')'"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本标识" prop="textMark">
<el-select
v-model="osdParams.textMark"
placeholder="请选择"
class="mr20"
>
<el-option
v-for="item in textlist"
:key="item.id"
:label="item.id + ' (' + item.name + ')'"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本内容" prop="textInfo">
<el-input
type="textarea"
:rows="3"
placeholder="请输入内容"
v-model="osdParams.textarea"
>
</el-input>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@click="osdSet"
:loading="osdSetLoading"
>设置</el-button
>
</el-form-item>
</el-form>
</div>
</el-tab-pane>
</el-tabs>
</div>
</el-tab-pane>
<el-tab-pane label="装置运行状态报" name="8"> <el-tab-pane label="装置运行状态报" name="8">
<div class="runform"> <div class="runform">
<el-form :model="runStatusForm" :inline="true" label-width="150px"> <el-form :model="runStatusForm" :inline="true" label-width="150px">
@ -604,6 +784,12 @@ export default {
idSetLoading: false, idSetLoading: false,
//水印（安徽） //水印（安徽）
waterForm: {}, waterForm: {},
//osd参数
osdParams: {},
textlist: [],
timelist: [],
osdLoading: false,
osdSetLoading: false,
accesslist: [], //通道选择器 accesslist: [], //通道选择器
channelId: 1, channelId: 1,
waterLoading: false, waterLoading: false,
@ -1038,6 +1224,9 @@ export default {
this.waterLoading = false; this.waterLoading = false;
this.waterSetLoading = false; this.waterSetLoading = false;
}, },
//查询设置osd
osdSearch() {},
osdSet() {},
//装置状态报 //装置状态报
//--act=runningstatus [0xEA] --cmdid=[CMD_ID] //--act=runningstatus [0xEA] --cmdid=[CMD_ID]
runstatusSearch() { runstatusSearch() {
@ -1324,6 +1513,15 @@ export default {
text-align: right; text-align: right;
} }
} }
.osdParam {
.channelBox {
.title {
width: 38px;
display: inline-block;
padding: 0 12px 0 0;
}
}
}
} }
} }
</style> </style>

6
src/views/realTimeMonitor/components/carouselChart.vue
Unescape Escape View File

@ -17,6 +17,7 @@
:src="currentPicPath + '!1366x768'" :src="currentPicPath + '!1366x768'"
:preview-src-list="srcList" :preview-src-list="srcList"
@load="loadImage" @load="loadImage"
@error="setDefaultImage"
ref="picJpg" ref="picJpg"
> >
<template slot="error"> <template slot="error">
@ -353,6 +354,11 @@ export default {
this.getPointList(data); this.getPointList(data);
}, },
loadImage() { loadImage() {
console.log("loading");
this.picLoading = false;
},
setDefaultImage(e) {
e.target.src = defaultImage;
this.picLoading = false; this.picLoading = false;
}, },
//鼠标滚动 //鼠标滚动

Write Preview
Loading…
Cancel
Save