Commit a8da046a by 潘建波

博关配置修改

1 parent e9b878f7
{"commit":"af680df9280d84c026e7ce21c2b21559ea924789","commitDate":"2021-5-20 16:58","buildDate":"2021-5-21 17:24","version":"2.1.0","info":"提交博关算法配置"}
\ No newline at end of file \ No newline at end of file
{"commit":"e9b878f7deaf4f5dad924a65071186ebc6f970d7","commitDate":"2021-5-25 16:10","buildDate":"2021-5-25 17:13","version":"2.1.0","info":"【BUG】修改密码验证方式 【new】增加用户显示,增加推出提示 【new】过车增加速度"}
\ No newline at end of file \ No newline at end of file
...@@ -4,7 +4,7 @@ import axios from "axios"; ...@@ -4,7 +4,7 @@ import axios from "axios";
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 = window.config.https?"https://192.168.9.233:20070":"http://192.168.9.233:20080"; // 测试环境url baseUrl = window.config.https?"https://192.168.9.233:20070":"http://192.168.9.173: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';
......
...@@ -77,9 +77,7 @@ export default { ...@@ -77,9 +77,7 @@ export default {
methods: { methods: {
showModal: function(data, mtaskdata) { showModal: function(data, mtaskdata) {
var _this = this; var _this = this;
this.$store.commit("setocxstate", 0);
this.taskData = mtaskdata; this.taskData = mtaskdata;
this.dialogVisible = true;
this.type = data.algo_type; this.type = data.algo_type;
// this.type = 2; // this.type = 2;
this.bgUrl = ""; this.bgUrl = "";
...@@ -114,8 +112,20 @@ export default { ...@@ -114,8 +112,20 @@ export default {
.catch(err => { .catch(err => {
console.log("区域设置截图返回异常:", err.message); console.log("区域设置截图返回异常:", err.message);
}); });
} else {
var picuri = this.uuid();
try {
document
.getElementById("VionVideo")
.CapturePicture("D:\\/" + picuri + ".jpg");
setTimeout(() => {
document.getElementById("pic").style.backgroundImage =
"url(D:\\/" + picuri + ".jpg)";
}, 500);
} catch (error) {}
} }
this.$store.commit("setocxstate", 0);
this.dialogVisible = true;
this.configxml = data.config; this.configxml = data.config;
setTimeout(() => { setTimeout(() => {
_this.$refs.canvas.stageInit(data.config); _this.$refs.canvas.stageInit(data.config);
......
...@@ -162,16 +162,7 @@ export default { ...@@ -162,16 +162,7 @@ export default {
*/ */
configInit(roiXml, confxml) { configInit(roiXml, confxml) {
this.curtool = ""; this.curtool = "";
var picuri = new Date().getTime();
try {
document
.getElementById("VionVideo")
.CapturePicture("D:\\/" + picuri + ".jpg");
setTimeout(() => {
document.getElementById("pic").style.backgroundImage =
"url(D:\\/" + picuri + ".jpg)";
}, 1500);
} catch (error) {}
let roiobj = this.oParse.parseXML(roiXml).roi; let roiobj = this.oParse.parseXML(roiXml).roi;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!