Skip to content

platform / fanxing_new

Go to a project
Commit 57400486 by 潘建波
Options

fix🐛 【BUG】效果展示”界面内抓拍结果的“抓拍时间”和“违法类型”项空白 

【BUG】效果展示”界面无法点播视频
【BUG】选中的模型线类型与实际画线效果不一致
【BUG】新添加模型框移动标定线会消失
【NEW】新增云台控制拉近拉远
【NEW】设备管理,无法显示出设备类型
1 parent 84835baa
Inline Side-by-side
Showing 8 changed files with 295 additions and 14 deletions
dist.zip
No preview for this file type
public/js/version.json
{"commit":"23fbe983f7a7521c94ee2cde07c7494eae55502a","commitDate":"2020-7-9 14:59","buildDate":"2020-7-14 11:35","version":"2.0.5","info":"删除测试文件"}
\ No newline at end of file \ No newline at end of file
{"commit":"84835baa8f06548d75add8b5fc4f93e6c10f8563","commitDate":"2020-7-14 16:35","buildDate":"2020-7-14 16:40","version":"2.0.5","info":"fix🐛 实事展示字段显示错误，新建任务，设备管理增加设备类型"}
\ No newline at end of file \ No newline at end of file
src/api/baseUrl.js
...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV); ...@@ -4,7 +4,7 @@ console.log(process.env.NODE_ENV);
switch (process.env.NODE_ENV) { switch (process.env.NODE_ENV) {
case "development": case "development":
// baseUrl = "http://192.168.9.234:20080"; // 测试环境url // baseUrl = "http://192.168.9.234:20080"; // 测试环境url
baseUrl = "http://192.168.9.233:20080"; // 测试环境url baseUrl = "http://192.168.9.149:20080"; // 测试环境url
// baseUrl = "http://192.168.9.82:8080"; // 测试环境url // baseUrl = "http://192.168.9.82:8080"; // 测试环境url
// baseUrl = "http://192.168.9.61:8086"; // baseUrl = "http://192.168.9.61:8086";
// baseUrl = 'http://vion-panda.51vip.biz:52510'; // baseUrl = 'http://vion-panda.51vip.biz:52510';
......
src/views/Show.vue
...@@ -133,11 +133,14 @@ export default { ...@@ -133,11 +133,14 @@ export default {
let params = url.split("?")[1]; let params = url.split("?")[1];
this.taskid = this.getQueryVariable("taskid"); this.taskid = this.getQueryVariable("taskid");
this.subtaskid = this.getQueryVariable("subtaskid"); this.subtaskid = this.getQueryVariable("subtaskid");
this.playurl = this.getQueryVariable("playurl"); this.playurl = JSON.parse(localStorage.getItem("showulr"));
}, },
mounted() { mounted() {
this.$refs.videoplay.videoPlay(); console.log(this.playurl)
setTimeout(() => {
this.$refs.videoplay.videoPlay();
}, 2000);
}, },
components: { components: {
videoplay videoplay
......
src/views/sceneManage/setting/index.vue
...@@ -346,10 +346,13 @@ export default { ...@@ -346,10 +346,13 @@ export default {
query: { query: {
taskid: this.taskid, taskid: this.taskid,
subtaskid: this.subtaskid, subtaskid: this.subtaskid,
playurl: this.playurl playurl: this.playurl?this.playurl.rtsp_url:''
} }
}); });
window.open(routeData.href, "_blank"); localStorage.setItem('showulr',JSON.stringify(this.playurl))
setTimeout(() => {
window.open(routeData.href, "_blank");
}, 0);
}, },
submit: function(xml, type) { submit: function(xml, type) {
let postObj = { let postObj = {
......
src/views/sceneManage/setting/ytconfig.vue
<template> <template>
<div class="control-box" v-show="showyt"> <div class="control-box" v-show="showyt">
<div class="control-let-box"> <div class="control-let-box">
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
</div> </div>
</div> </div>
<div class="control-right-box"> <div class="control-right-box">
<div class="slider-box"> <!-- <div class="slider-box">
<span class="title">光圈</span> <span class="title">光圈</span>
<el-slider class="slider-item" v-model="value1" show-input></el-slider> <el-slider class="slider-item" v-model="value1" show-input></el-slider>
</div> </div>
...@@ -69,6 +70,17 @@ ...@@ -69,6 +70,17 @@
<div class="slider-box"> <div class="slider-box">
<span class="title">速度</span> <span class="title">速度</span>
<el-slider class="slider-item" v-model="value4" show-input></el-slider> <el-slider class="slider-item" v-model="value4" show-input></el-slider>
</div> -->
<div class="slider-box" style="margin-bottom:6vh;margin-top:3vh">
<span class="title">变倍</span>
<span class="el-icon-circle-plus s-icon s-plus"
@mousedown="Ytontroller(10)"
@mouseup="stopYtontroller(11)"
></span>
<span class="el-icon-remove s-icon"
@mousedown="Ytontroller(9)"
@mouseup="stopYtontroller(11)"
></span>
</div> </div>
<div class="right-bottom-box"> <div class="right-bottom-box">
<div class="setyzw item-box"> <div class="setyzw item-box">
...@@ -207,8 +219,9 @@ export default { ...@@ -207,8 +219,9 @@ export default {
.title { .title {
float: left; float: left;
width: 2vw; width: 2.3vw;
line-height: 35px; line-height: 35px;
font-size 16px
} }
.slider-item { .slider-item {
...@@ -239,4 +252,12 @@ export default { ...@@ -239,4 +252,12 @@ export default {
.yzw-box .control-btn:hover{ .yzw-box .control-btn:hover{
color #409EFF color #409EFF
} }
.s-icon {
font-size 25px
line-height 35px
}
.s-plus {
margin-right 20px
margin-left 10px
}
</style> </style>
src/views/sceneManage/setting/ytconfigback.vue 0 → 100644
<template>
<div class="control-box" v-show="showyt">
<div class="control-let-box">
<div class="yzw-box">
<span
@mousedown="Ytontroller(5)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-zuoshang"
></span>
<span
@mousedown="Ytontroller(3)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-shang"
></span>
<span
@mousedown="Ytontroller(6)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-youshang"
></span>
</div>
<div class="yzw-box">
<span
@mousedown="Ytontroller(1)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-zuo"
></span>
<span
@mousedown="Ytontroller('12')"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-zhongzhi"
></span>
<span
@mousedown="Ytontroller(2)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-you"
></span>
</div>
<div class="yzw-box">
<span
@mousedown="Ytontroller(7)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-zuoxia"
></span>
<span
@mousedown="Ytontroller(4)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-xia"
></span>
<span
@mousedown="Ytontroller(8)"
@mouseup="stopYtontroller(11)"
class="control-btn icon-fanxing-youxia"
></span>
</div>
</div>
<div class="control-right-box">
<div class="slider-box">
<span class="title">光圈</span>
<el-slider class="slider-item" v-model="value1" show-input></el-slider>
</div>
<div class="slider-box">
<span class="title">光倍</span>
<el-slider class="slider-item" v-model="value2" show-input></el-slider>
</div>
<div class="slider-box">
<span class="title">焦距</span>
<el-slider class="slider-item" v-model="value3" show-input></el-slider>
</div>
<div class="slider-box">
<span class="title">速度</span>
<el-slider class="slider-item" v-model="value4" show-input></el-slider>
</div>
<div class="right-bottom-box">
<div class="setyzw item-box">
<el-input placeholder="预置位编号" v-model="presetindex"></el-input>
</div>
<div class="subbtn item-box">
<el-button @click="subset">确定</el-button>
</div>
<div class="closebtn item-box">
<el-button @click="closeyt">关闭</el-button>
</div>
<div class="delbtn item-box">
<el-button @click="deleteytconfig" type="danger">删除</el-button>
</div>
</div>
</div>
</div>
</template>
<script>
import {
StopControlCamera,
controlDevice,
getControlParam,
setCameraSpeed,
connectCamera
} from "../../../assets/js/YtContronByVionVideo.js";
import { CameraController } from "../../../assets/js/positionOperateByVido.js";
const optionController = new CameraController();
export default {
data() {
return {
showyt: false,
value: 0,
value1: 0,
value2: 0,
value3: 0,
value4: 0,
presetindex: "",
curtask: {}
};
},
props: ["vchan"],
methods: {
openyt(curtask) {
if (curtask) {
this.curtask = curtask;
this.showyt = true;
this.presetindex = curtask.position_num;
} else {
this.$message({
message: "请选择要操作的预置位",
type: "warning"
});
}
},
closeyt() {
this.showyt = false;
},
/**
* 控制云台
* @param {code}
*/
Ytontroller(nType, nParam = null) {
try {
let vrefid = this.vchan.refid || this.vchan.vchan_refid;
document
.getElementById("VionVideo")
.VionPTZControl(String(vrefid), Number(nType), 1);
} catch (error) {
console.log(error);
}
console.log(nType);
},
stopYtontroller(nType) {
let vrefid = this.vchan.refid || this.vchan.vchan_refid;
document
.getElementById("VionVideo")
.VionPTZControl(String(vrefid), Number(nType), 1);
},
subset() {
let vrefid = this.vchan.refid || this.vchan.vchan_refid;
document
.getElementById("VionVideo")
.VionPTZControl(String(vrefid), Number(18), Number(this.presetindex));
this.$emit("subpostion", this.presetindex);
},
deleteytconfig() {
this.$emit("deleteytconfig", this.presetindex);
this.showyt = false;
}
}
};
</script>
<style lang="stylus" scoped>
.control-box {
position: absolute;
top: 0;
left: 0;
right: 0;
margin: auto;
color: #333;
z-index: 100;
height: 24vh;
width: 31vw;
margin-top: 0.5vh;
background: #ffffff;
box-shadow: 1px 0px 4px 3px rgba(74, 74, 74, 0.14);
}
.control-let-box {
float: left;
width: 12vw;
.control-btn {
height: 5vh;
margin-top: 2vh;
width: 3.8vw;
overflow: hidden;
font-size: 30px;
text-align: center;
color: #cccccc;
font-weight: 600;
display inline-block
}
}
.control-right-box {
float: left;
width: 18.5vw;
}
.slider-box {
overflow: hidden;
.title {
float: left;
width: 2vw;
line-height: 35px;
}
.slider-item {
float: left;
width: 16vw;
}
}
.item-box {
float: left;
margin-top: 1vh;
}
.item-box:nth-child(1) {
margin-left: 0;
}
.setyzw {
width: 6vw;
}
.subbtn {
margin: 1vh 0.3vw 0 2vw;
}
.delbtn {
margin-left:.4vw
}
.yzw-box .control-btn:hover{
color #409EFF
}
</style>
src/views/taskManage/subtask.vue
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<span class="subtask-info">{{ subTaskData.video_total }}</span> --> <span class="subtask-info">{{ subTaskData.video_total }}</span> -->
<span class="label">任务信息</span> <span class="label">任务信息</span>
<span class="subtask-info">{{ subTaskData.info }}</span> <span class="subtask-info">{{ subTaskData.info }}</span>
<!-- <span class="label">分析设备</span> <span class="label" hidden>分析设备</span>
<span class="subtask-info"> <span class="subtask-info" hidden>
<el-select v-model="assign_id"> <el-select v-model="assign_id">
<el-option <!-- <el-option
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
:key="index" :key="index"
:value="item.device_id" :value="item.device_id"
...@@ -26,20 +26,32 @@ ...@@ -26,20 +26,32 @@
subTaskData.plate_type && subTaskData.plate_type &&
item.license_info.platType === subTaskData.plate_type item.license_info.platType === subTaskData.plate_type
" "
> -->
<el-option
v-for="(item, index) in freeList"
:key="index"
:value="item.device_id"
:label="item.in_ip"
> >
{{ item.in_ip }} {{ item.license_info.platType }} {{ item.in_ip }} {{ item.license_info.platType }}
</el-option> </el-option>
<el-option <!-- <el-option
v-for="(item, index) in freeList" v-for="(item, index) in freeList"
:key="index" :key="index"
:value="item.device_id" :value="item.device_id"
:label="item.in_ip" :label="item.in_ip"
v-if="!subTaskData.plate_type" v-if="!subTaskData.plate_type"
> -->
<!-- <el-option
v-for="(item, index) in freeList"
:key="index"
:value="item.device_id"
:label="item.in_ip"
> >
{{ item.in_ip }} {{ item.license_info.platType }} {{ item.in_ip }} {{ item.license_info.platType }}
</el-option> </el-option> -->
</el-select> </el-select>
</span> --> </span>
<span class="label sub-btn" @click="subMove" hidden>确定</span> <span class="label sub-btn" @click="subMove" hidden>确定</span>
</div> </div>
</template> </template>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!