Commit f25c960d by 潘建波

合并修改

2 parents 490b3faa a8da046a
...@@ -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,9 +162,6 @@ export default { ...@@ -162,9 +162,6 @@ export default {
*/ */
configInit(roiXml, confxml) { configInit(roiXml, confxml) {
this.curtool = ""; this.curtool = "";
let roiobj = this.oParse.parseXML(roiXml).roi; let roiobj = this.oParse.parseXML(roiXml).roi;
if (roiobj === undefined) { if (roiobj === undefined) {
roiobj = {}; roiobj = {};
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!