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

优化提示

Browse Source
master
fanluyan 2 years ago
parent f01e01da70
commit 521cd167c5
4 changed files with 374 additions and 324 deletions
Show Stats Download Patch File Download Diff File

8
src/components/message.js
Unescape Escape View File

@ -1,13 +1,18 @@
/**重置message，防止重复点击重复弹出message弹框 */ //resetMessage.js
/**重置message，防止重复点击重复弹出message消息提示 */
import { Message } from "element-ui"; import { Message } from "element-ui";
let messageInstance = null; let messageInstance = null;
const resetMessage = (options) => { const resetMessage = (options) => {
if (messageInstance) { if (messageInstance) {
messageInstance.close(); messageInstance.close();
} }
Message.closeAll(); //手动关闭所有消息提示实例
messageInstance = Message(options); messageInstance = Message(options);
// console.log(Message(options));
}; };
["error", "success", "info", "warning"].forEach((type) => { ["error", "success", "info", "warning"].forEach((type) => {
resetMessage[type] = (options) => { resetMessage[type] = (options) => {
if (typeof options === "string") { if (typeof options === "string") {
@ -19,4 +24,5 @@ const resetMessage = (options) => {
return resetMessage(options); return resetMessage(options);
}; };
}); });
export const message = resetMessage; export const message = resetMessage;

1
src/main.js
Unescape Escape View File

@ -8,6 +8,7 @@ import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css"; import "element-ui/lib/theme-chalk/index.css";
import { message } from "./components/message.js"; import { message } from "./components/message.js";
Vue.prototype.$message = message; Vue.prototype.$message = message;
Vue.use(ElementUI, { Vue.use(ElementUI, {
size: "small", size: "small",

6
src/views/cameraChannel/components/adddeviceDialog.vue
Unescape Escape View File

@ -87,14 +87,14 @@ export default {
formArr.push(this.formdata); formArr.push(this.formdata);
addChannelapi({ list: formArr }) addChannelapi({ list: formArr })
.then((res) => { .then((res) => {
this.errorMsg = ""; //this.errorMsg = "";
if (res.code == 200) { if (res.code == 200) {
this.$message.success("添加成功"); this.$message.success("添加成功");
this.$parent.deviceList(); this.$parent.deviceList();
this.isShow = false; this.isShow = false;
} else { } else {
this.errorMsg = res.msg; //this.errorMsg = res.msg;
//this.$message.error(res.msg); this.$message.error(res.msg);
} }
}) })
.catch((err) => { .catch((err) => {

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

@ -1,6 +1,6 @@
<template> <template>
<el-dialog <el-dialog
class="setTimeDialog" class="setimgDialog"
title="图像采集参数" title="图像采集参数"
:visible.sync="isShow" :visible.sync="isShow"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -22,29 +22,58 @@
</div> </div>
<div class="flexno bt30"> <div class="flexno bt30">
<div class="wt80">色彩选择:</div> <div class="wt80">色彩选择:</div>
<el-input v-model="capturenr.color" :disabled="true" class="wt280"></el-input> <el-input
v-model="capturenr.color"
:disabled="true"
class="wt280"
></el-input>
</div> </div>
<div class="flexno bt30"> <div class="flexno bt30">
<div class="wt80">图像分辨率:</div> <div class="wt80">图像分辨率:</div>
<el-input v-model="capturenr.resolution" :disabled="true" class="wt280"></el-input> <el-input
v-model="capturenr.resolution"
:disabled="true"
class="wt280"
></el-input>
</div> </div>
<div class="flexno bt30"> <div class="flexno bt30">
<div class="wt80">亮度:</div> <div class="wt80">亮度:</div>
<el-input v-model="capturenr.luminance" :disabled="true" class="wt280"></el-input> <el-input
v-model="capturenr.luminance"
:disabled="true"
class="wt280"
></el-input>
</div> </div>
<div class="flexno bt30"> <div class="flexno bt30">
<div class="wt80">对比度:</div> <div class="wt80">对比度:</div>
<el-input v-model="capturenr.contrast" :disabled="true" class="wt280"></el-input> <el-input
v-model="capturenr.contrast"
:disabled="true"
class="wt280"
></el-input>
</div> </div>
<div class="flexno bt30"> <div class="flexno bt30">
<div class="wt80">饱和度:</div> <div class="wt80">饱和度:</div>
<el-input v-model="capturenr.saturation" :disabled="true" class="wt280"></el-input> <el-input
v-model="capturenr.saturation"
:disabled="true"
class="wt280"
></el-input>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设置参数" name="2"> <el-tab-pane label="设置参数" name="2">
<el-form :model="setForm" :rules="rules" ref="setForm" label-width="120px" > <el-form
:model="setForm"
:rules="rules"
ref="setForm"
label-width="120px"
>
<el-form-item label="通道" prop="channelId"> <el-form-item label="通道" prop="channelId">
<el-select v-model="setForm.channelId" placeholder="请选择" class="mr20"> <el-select
v-model="setForm.channelId"
placeholder="请选择"
class="mr20"
>
<el-option <el-option
v-for="item in accesslist" v-for="item in accesslist"
:key="item.channelid" :key="item.channelid"
@ -54,7 +83,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="色彩选择" prop="color"> <el-form-item label="色彩选择" prop="color">
<el-select v-model="setForm.color" placeholder="请选择" class="mr20"> <el-select
v-model="setForm.color"
placeholder="请选择"
class="mr20"
>
<el-option <el-option
v-for="item in colorlist" v-for="item in colorlist"
:key="item.id" :key="item.id"
@ -64,13 +97,25 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="对比度" prop="contrast"> <el-form-item label="对比度" prop="contrast">
<el-input-number v-model="setForm.contrast" :min="1" :max="100"></el-input-number> <el-input-number
v-model="setForm.contrast"
:min="1"
:max="100"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="亮度" prop="luminance"> <el-form-item label="亮度" prop="luminance">
<el-input-number v-model="setForm.luminance" :min="1" :max="100"></el-input-number> <el-input-number
v-model="setForm.luminance"
:min="1"
:max="100"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="图像分辨率" prop="resolution"> <el-form-item label="图像分辨率" prop="resolution">
<el-select v-model="setForm.resolution" placeholder="请选择" class="mr20"> <el-select
v-model="setForm.resolution"
placeholder="请选择"
class="mr20"
>
<el-option <el-option
v-for="item in ratiolist" v-for="item in ratiolist"
:key="item.id" :key="item.id"
@ -80,25 +125,31 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="饱和度" prop="saturation"> <el-form-item label="饱和度" prop="saturation">
<el-input-number v-model="setForm.saturation" :min="1" :max="100"></el-input-number> <el-input-number
v-model="setForm.saturation"
:min="1"
:max="100"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submitbtn('setForm')">确认</el-button> <el-button type="primary" @click="submitbtn('setForm')"
>确认</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import {
getChannelListJoggle, getChannelListJoggle,
getPhotoParamApi, getPhotoParamApi,
setPhotoParamApi, setPhotoParamApi,
getPhotoParamnrApi, getPhotoParamnrApi,
getResolutionRatio getResolutionRatio,
} from "@/utils/api/index"; } from "@/utils/api/index";
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
@ -107,71 +158,64 @@
accesslist: [], //通道选择器 accesslist: [], //通道选择器
colorlist: [ colorlist: [
{ {
name:'黑白', name: "黑白",
id:0 id: 0,
}, },
{ {
name:'彩色', name: "彩色",
id:1 id: 1,
} },
],//色彩选择器 ], //色彩选择器
ratiolist:[],//图像分辨率 ratiolist: [], //图像分辨率
selaccess: "", //选中的通道 selaccess: "", //选中的通道
capturenr:{}, //查询后的内容 capturenr: {}, //查询后的内容
setForm:{},//设置参数 setForm: {}, //设置参数
rules: { rules: {
channelId: [ channelId: [{ required: true, message: "请选择通道", trigger: "blur" }],
{ required: true, message: '请选择通道', trigger: 'blur' } color: [{ required: true, message: "请选择色彩", trigger: "blur" }],
],
color: [
{ required: true, message: '请选择色彩', trigger: 'blur' }
],
contrast: [ contrast: [
{ required: true, message: '请输入对比度', trigger: 'blur' } { required: true, message: "请输入对比度", trigger: "blur" },
],
luminance: [
{ required: true, message: '请输入亮度', trigger: 'blur' }
], ],
luminance: [{ required: true, message: "请输入亮度", trigger: "blur" }],
resolution: [ resolution: [
{ required: true, message: '请输入图像分辨率', trigger: 'blur' } { required: true, message: "请输入图像分辨率", trigger: "blur" },
], ],
saturation: [ saturation: [
{ required: true, message: '请输入饱和度', trigger: 'blur' } { required: true, message: "请输入饱和度", trigger: "blur" },
], ],
}, },
timer:null, timer: null,
seltermid:'',//装置id seltermid: "", //装置id
selcmdId:'',//cmdId selcmdId: "", //cmdId
requestId:'' requestId: "",
}; };
}, },
mounted() { mounted() {},
},
methods: { methods: {
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
}, },
//获取设备通道 //获取设备通道
getSingleAccess(val) { getSingleAccess(val) {
this.setForm={} this.setForm = {};
console.log(val) console.log(val);
this.seltermid = val.id; this.seltermid = val.id;
this.selcmdId = val.cmdid this.selcmdId = val.cmdid;
getChannelListJoggle({ termid: this.seltermid }) getChannelListJoggle({ termid: this.seltermid })
.then((res) => { .then((res) => {
this.accesslist = res.data.list; this.accesslist = res.data.list;
this.selaccess = res.data.list[0].channelid; this.selaccess = res.data.list[0].channelid;
this.$set(this.setForm,'channelId',res.data.list[0].channelid) this.$set(this.setForm, "channelId", res.data.list[0].channelid);
}) })
.catch((err) => {}); .catch((err) => {});
}, },
//获取图像分辨率 //获取图像分辨率
getRatio(){ getRatio() {
this.$set(this.setForm,'color',this.colorlist[0].id) this.$set(this.setForm, "color", this.colorlist[0].id);
getResolutionRatio() getResolutionRatio()
.then((res) => { .then((res) => {
this.ratiolist = res.data.list; this.ratiolist = res.data.list;
this.$set(this.setForm,'resolution',res.data.list[0].id) this.$set(this.setForm, "resolution", res.data.list[0].id);
}) })
.catch((err) => {}); .catch((err) => {});
}, },
@ -185,22 +229,22 @@
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.requestId = res.data.requestId; this.requestId = res.data.requestId;
this.inquirenr() this.inquirenr();
this.timer = window.setInterval(() => { this.timer = window.setInterval(() => {
this.inquirenr(); this.inquirenr();
}, 10000); }, 10000);
}else{ } else {
this.$message.error(res.code.msg); this.$message.error(res.code.msg);
} }
}) })
.catch((err) => {}); .catch((err) => {});
}, },
//查询接口 //查询接口
inquirenr(){ inquirenr() {
getPhotoParamnrApi({ getPhotoParamnrApi({
channelId: this.selaccess, channelId: this.selaccess,
termId: this.seltermid, termId: this.seltermid,
requestId: this.requestId requestId: this.requestId,
}) })
.then((res) => { .then((res) => {
this.loading = false; this.loading = false;
@ -209,27 +253,27 @@
this.$message.success("查询已更新"); this.$message.success("查询已更新");
this.capturenr = res.data; this.capturenr = res.data;
clearInterval(this.timer); clearInterval(this.timer);
}else{ } else {
this.capturenr = res.data; this.capturenr = res.data;
} }
}else{ } else {
this.$message.error(res.code.msg); this.$message.error(res.code.msg);
} }
}) })
.catch((err) => {}); .catch((err) => {});
}, },
//确认 //确认
submitbtn(setForm){ submitbtn(setForm) {
this.$set(this.setForm,'cmdId',this.selcmdId) this.$set(this.setForm, "cmdId", this.selcmdId);
this.$set(this.setForm,'termId',this.seltermid) this.$set(this.setForm, "termId", this.seltermid);
this.$refs[setForm].validate((valid) => { this.$refs[setForm].validate((valid) => {
if (valid) { if (valid) {
setPhotoParamApi(this.setForm) setPhotoParamApi(this.setForm)
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("设置成功"); this.$message.success("设置成功");
this.isShow = false this.isShow = false;
}else{ } else {
this.$message.error(res.code.msg); this.$message.error(res.code.msg);
} }
}) })
@ -248,10 +292,10 @@
this.isShow = false; this.isShow = false;
}, },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.setTimeDialog { .setimgDialog {
.el-tabs__content { .el-tabs__content {
height: 400px; height: 400px;
overflow: auto; overflow: auto;
@ -322,8 +366,8 @@
} }
} }
} }
} }
.setRoadDialog { .setRoadDialog {
.el-dialog__body { .el-dialog__body {
height: 400px; height: 400px;
overflow: auto; overflow: auto;
@ -342,6 +386,5 @@
} }
} }
} }
} }
</style> </style>

Write Preview
Loading…
Cancel
Save