Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -103,17 +103,11 @@ export default {
         name: info.loginName,
       });
       let { modelUrl, modelName, modelIcon } = row;
+      let path = this.$route.path;
       window.open(
-        `${modelUrl}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}`,
+        `${modelUrl}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}&path=${path}`,
         "_blank"
       );
-
-      /*      if (reg.test(href)) {
-        window.open(
-          `${href}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}`,
-          "_blank"
-        );
-      }*/
     },
   },
 };