Merge branch 'dev-烟台中转登录' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-烟台中转登录

# Conflicts:
#	src/views/pages/yantai-login-transit.vue

src/views/pages/yantai-login-transit.vue

@@ -23,7 +23,7 @@ export default {
 
   async mounted() {
     let code = getQueryPara("code");
-    console.log("------------------code", code);
+    alert(code+"location.href;"+location.href);
     const loading = this.$loading({
       lock: true,
       text: "登录中……",
@@ -35,13 +35,31 @@ export default {
       await this.login(code);
       loading.close();
     } else {
-      //   location.href =
+      //   await this.skip(code);
-      //     "http://172.20.46.155:8080/sso/login?client_id=1000006&redirect_url=" +
+      let uriComponent = "http://172.20.46.177/epmet-oper-gov/#/login/";
-      //     encodeURIComponent(location.href);
+      //let uriComponent = "https://172.20.46.177:65221/#/";
+      let redirect_url = encodeURIComponent(uriComponent);
+      let url = "http://172.20.46.155:8080/sso/login?client_id=1000009&redirect_url="+redirect_url;
+      window.open(url,'_self');
     }
   },
 
   methods: {
+    //根据社区id获取小区列表
+    async skip() {
+      const url = "/gov222";
+
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        location.href = data.url;
+      } else {
+        console.log("获取跳转页面失败", msg);
+      }
+    },
+
     //根据社区id获取小区列表
     async login(client_code) {
       const url = "/auth/sso-govlogin-yantai/" + client_code;