xymp
/
frontend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xy-ly' into fly

Browse Source
master
fanluyan 2 years ago
parent b92db2963c 3bb6010217
commit f2912ea150
4 changed files with 126 additions and 45 deletions
Show Stats Download Patch File Download Diff File

18
src/utils/api/index.js
Unescape Escape View File

@ -309,6 +309,7 @@ export function resetTerminalApi(data) {
});
}
//图像采集参数
//图像采集装置设置 列表
export function getImageResolutionListJoggle(data) {
return request({
@ -317,6 +318,23 @@ export function getImageResolutionListJoggle(data) {
data,
});
}
//图像参数查询
export function getPhotoParamApi(data) {
return request({
url: "/api/getPhotoQueryParamList",
method: "post",
data,
});
}
//图像参数设置
export function setPhotoParamApi(data) {
return request({
url: "/api/updatePhotoParam",
method: "post",
data,
});
}
//设置图像参数 setImageParams

133
src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue
Unescape Escape View File

@ -22,41 +22,58 @@
</div>
<div class="flexno bt30">
<div class="wt80">色彩选择:</div>
<el-input v-model="capturenr.scxz" :disabled="true" class="wt280"></el-input>
<el-input v-model="capturenr.color" :disabled="true" class="wt280"></el-input>
</div>
<div class="flexno bt30">
<div class="wt80">图像分辨率:</div>
<el-input v-model="capturenr.scxz" :disabled="true" class="wt280"></el-input>
<el-input v-model="capturenr.resolution" :disabled="true" class="wt280"></el-input>
</div>
<div class="flexno bt30">
<div class="wt80">亮度:</div>
<el-input v-model="capturenr.scxz" :disabled="true" class="wt280"></el-input>
<el-input v-model="capturenr.luminance" :disabled="true" class="wt280"></el-input>
</div>
<div class="flexno bt30">
<div class="wt80">对比度:</div>
<el-input v-model="capturenr.scxz" :disabled="true" class="wt280"></el-input>
<el-input v-model="capturenr.contrast" :disabled="true" class="wt280"></el-input>
</div>
<div class="flexno bt30">
<div class="wt80">饱和度:</div>
<el-input v-model="capturenr.scxz" :disabled="true" class="wt280"></el-input>
<el-input v-model="capturenr.saturation" :disabled="true" class="wt280"></el-input>
</div>
</el-tab-pane>
<el-tab-pane label="设置参数" name="2">
<el-form :model="setForm" :rules="rules" ref="setForm" label-width="120px" >
<el-form-item label="色彩选择" prop="name">
<el-input v-model="setForm.name" class="wt280"></el-input>
<el-form-item label="通道" prop="channelId">
<el-select v-model="setForm.channelId" placeholder="请选择" class="mr20">
<el-option
v-for="item in accesslist"
:key="item.channelid"
:label="item.channelname"
:value="item.channelid"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="图像分辨率" prop="name">
<el-input v-model="setForm.name" class="wt280"></el-input>
<el-form-item label="色彩选择" prop="color">
<el-select v-model="setForm.color" placeholder="请选择" class="mr20">
<el-option
v-for="item in colorlist"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="亮度" prop="name">
<el-input v-model="setForm.name" class="wt280"></el-input>
<el-form-item label="对比度" prop="contrast">
<el-input-number v-model="setForm.contrast" :min="1" :max="100"></el-input-number>
</el-form-item>
<el-form-item label="对比度" prop="name">
<el-input v-model="setForm.name" class="wt280"></el-input>
<el-form-item label="亮度" prop="luminance">
<el-input-number v-model="setForm.luminance" :min="1" :max="100"></el-input-number>
</el-form-item>
<el-form-item label="饱和度" prop="name">
<el-input v-model="setForm.name" class="wt280"></el-input>
<el-form-item label="图像分辨率" prop="resolution">
<el-input v-model="setForm.resolution" class="wt280"></el-input>
</el-form-item>
<el-form-item label="饱和度" prop="saturation">
<el-input-number v-model="setForm.saturation" :min="1" :max="100"></el-input-number>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitbtn('setForm')">确认</el-button>
@ -69,7 +86,8 @@
<script>
import {
getChannelListJoggle,
getSchedulenr
getPhotoParamApi,
setPhotoParamApi
} from "@/utils/api/index";
export default {
data() {
@ -78,14 +96,41 @@
isShow: false,
activeName: "1", //选项卡
accesslist: [], //通道选择器
colorlist: [
{
name:'黑白',
id:0
},
{
name:'彩色',
id:1
}
],//色彩选择器
selaccess: "", //选中的通道
capturenr:{}, //查询后的内容
setForm:{},//设置参数
rules: {
name: [
{ required: true, message: '请输入活动名称', trigger: 'blur' }
channelId: [
{ required: true, message: '请选择通道', trigger: 'blur' }
],
}
color: [
{ required: true, message: '请选择色彩', trigger: 'blur' }
],
contrast: [
{ required: true, message: '请输入对比度', trigger: 'blur' }
],
luminance: [
{ required: true, message: '请输入亮度', trigger: 'blur' }
],
resolution: [
{ required: true, message: '请输入图像分辨率', trigger: 'blur' }
],
saturation: [
{ required: true, message: '请输入饱和度', trigger: 'blur' }
],
},
seltermid:'',//装置id
selcmdId:'',//cmdId
};
},
mounted() {},
@ -94,36 +139,52 @@
console.log(tab, event);
},
//获取设备通道
getSingleAccess(id) {
this.selfacilityId = id;
getChannelListJoggle({ termid: id })
getSingleAccess(val) {
console.log(val)
this.seltermid = val.id;
this.selcmdId = val.cmdid
getChannelListJoggle({ termid: this.seltermid })
.then((res) => {
this.accesslist = res.data.list;
this.selaccess = res.data.list[0].channelid;
this.$set(this.setForm,'channelId',res.data.list[0].channelid)
})
.catch((err) => {});
},
//查询
inquirebtn() {
// this.loading = true;
// getSchedulenr({
// channelid: this.selaccess,
// terminalid: this.selfacilityId,
// })
// .then((res) => {
// this.$message.success("查询成功");
// this.capturenr = res.data;
// this.loading = false;
// })
// .catch((err) => {
// this.$message.error("查询失败");
// });
this.loading = true;
getPhotoParamApi({
channelid: this.selaccess,
cmdId: this.selcmdId,
})
.then((res) => {
this.$message.success("查询成功");
this.capturenr = res.data;
this.loading = false;
})
.catch((err) => {
this.$message.error("查询失败");
});
},
//确认
submitbtn(setForm){
this.$set(this.setForm,'cmdId',this.selcmdId)
this.$set(this.setForm,'termId',this.seltermid)
this.$refs[setForm].validate((valid) => {
if (valid) {
setPhotoParamApi(this.setForm)
.then((res) => {
if (res.code == 200) {
this.$message.success("设置成功");
this.isShow = false
}else{
this.$message.error(res.code.msg);
}
})
.catch((err) => {
this.$message.error("设置失败");
});
} else {
return false;
}

3
src/views/management/monitoringEquipment/photographicDevice/index.vue
Unescape Escape View File

@ -181,7 +181,6 @@ export default {
//获取选中的行
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
},
//时间转化
dateFormat(row, column) {
@ -216,7 +215,7 @@ export default {
//图像采集参数
handleImageCapture(data){
this.$refs.imageCaptureref.display()
this.$refs.imageCaptureref.getSingleAccess(data.id)
this.$refs.imageCaptureref.getSingleAccess(data)
},
// //新建弹窗handleAddPhoto

17
src/views/realTimeMonitor/components/infoDialog.vue
Unescape Escape View File

@ -6,6 +6,7 @@
:close-on-click-modal="false"
width="50%"
@close="handleclose"
v-loading="loading"
>
<div class="infoTable">
<el-descriptions class="margin-top" :column="1" border>
@ -41,7 +42,7 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 工作状态更新时间 </template
>{{ infornr.wsUpdateTime }}
>{{  $moment(infornr.wsUpdateTime).format("yy-MM-DD HH:mm:ss") }}
</el-descriptions-item>
</el-descriptions>
</div>
@ -63,7 +64,7 @@ export default {
isShow: false,
infornr: {}, //装置信息内容
timer: null,
queryTime: "", //请求时间
requestId:'',//查询ID
};
},
mounted() {},
@ -74,9 +75,8 @@ export default {
termId: val,
})
.then((res) => {
this.infornr = res.data;
this.queryTime = res.data.queryTime;
console.log(this.queryTime);
this.requestId = res.data.requestId
this.getNewListData(val);
this.timer = window.setInterval(() => {
this.getNewListData(val);
}, 10000);
@ -86,17 +86,20 @@ export default {
//最新数据
getNewListData(val) {
getNewDeviceList({
requestId: this.requestId,
termId: val,
queryTime: this.queryTime,
})
.then((res) => {
if (res.data !== null) {
this.loading = false
if (res.data.isNew == true) {
this.infornr = res.data;
this.$message({
message: "装置信息已更新",
type: "success",
});
clearInterval(this.timer);
}else{
this.infornr = res.data;
}
})
.catch((err) => {});

Write Preview
Loading…
Cancel
Save