合并修改

public/js/version.json

-{"commit":"e9b878f7deaf4f5dad924a65071186ebc6f970d7","commitDate":"2021-5-25 16:10","buildDate":"2021-5-27 19:23","version":"2.0.9","info":"【BUG】修改密码验证方式 【new】增加用户显示，增加推出提示 【new】过车增加速度"}
\ No newline at end of file
+{"commit":"e9b878f7deaf4f5dad924a65071186ebc6f970d7","commitDate":"2021-5-25 16:10","buildDate":"2021-5-27 19:23","version":"2.0.9","info":"【BUG】修改密码验证方式 【new】增加用户显示，增加推出提示 【new】过车增加速度"}

src/views/sceneManage/setting/area.vue

@@ -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 {
           .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);

src/views/sceneManage/setting/areaconfig/Behavior.vue

@@ -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 = {};