合并代码

zkqy-ui/src/layout/index.vue

@@ -6,7 +6,7 @@
         <el-col :span="12">
           <div class="logo-title">
             <!-- <img src="../assets/images/mes412.png" alt="" class="imgg" /> -->
-            <img :src="logo" alt="" class="imgg"/>
+            <img :src="logo" alt="" class="imgg" />
             <span class="title">{{ title }}</span>
             <!-- <img src="../assets/images/comlo.png" alt="" class="imgg" /> -->
           </div>
@@ -20,7 +20,7 @@
               <span style="">
                 <span class="jianbiase">{{ username || "默认用户" }}</span>
               </span>
-              <img :src="avatar" class="user-avatar"/>
+              <img :src="avatar" class="user-avatar" />
               <!-- <i class="el-icon-caret-bottom" /> -->
             </div>
             <el-dropdown-menu slot="dropdown" style="margin-top: -20px">
@@ -61,11 +61,11 @@
       >
         <div :class="{ 'fixed-header': fixedHeader }">
           <!-- <navbar /> -->
-          <tags-view v-if="needTagsView"/>
+          <tags-view v-if="needTagsView" />
         </div>
-        <app-main/>
+        <app-main />
         <right-panel>
-          <settings/>
+          <settings />
         </right-panel>
       </div>
     </div>
@@ -73,17 +73,17 @@
 </template>
 
 <script>
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 import RightPanel from "@/components/RightPanel";
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from "./components";
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
 import ResizeMixin from "./mixin/ResizeHandler";
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 import variables from "@/assets/styles/variables.scss";
 import mes412 from "@/assets/images/mes412.svg";
 import mecLogoLogin from "@/assets/images/mec-logo-login.svg";
 import mecosLogo1 from "@/assets/images/mecosLogo1.svg";
 
-import {refreshToken} from "@/api/login";
+import { refreshToken } from "@/api/login";
 
 export default {
   name: "Layout",
@@ -168,11 +168,10 @@ export default {
           //   this.$router.push({path: "/login", query: {tenantCode: tenantCode}});
           // });
         })
-        .catch(() => {
-        });
+        .catch(() => {});
     },
     handleClickOutside() {
-      this.$store.dispatch("app/closeSideBar", {withoutAnimation: false});
+      this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
     },
     getlogo() {
       let logo = sessionStorage.getItem("logo");
@@ -192,7 +191,7 @@ export default {
     this.getlogo();
     var user = JSON.parse(sessionStorage.getItem("sessionObj"));
     if (user) {
-      this.userName = JSON.parse(user.data()).username;
+      this.userName = JSON.parse(user.data).username;
     }
     // this.startTokenRefresh();
   },

zkqy-ui/src/views/login.vue

@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="4" :offset="1">
             <div class="login-code">
-              <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
             </div>
           </el-col>
         </el-row>
@@ -70,7 +70,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div> -->
         <el-checkbox v-model="loginForm.rememberMe" class="aaa"
-        >在这个设备上记住我
+          >在这个设备上记住我
         </el-checkbox>
       </el-row>
 
@@ -79,7 +79,7 @@
           class="logg"
           :loading="loading"
           @click.native.prevent="handleLogin"
-        >登录
+          >登录
         </el-col>
       </el-row>
     </el-form>
@@ -87,10 +87,10 @@
 </template>
 
 <script>
-import {getCodeImg, isTenantExist, ssoLogin} from "@/api/login";
-import {changeDatasource} from "@/api/dataEngine";
+import { getCodeImg, isTenantExist, ssoLogin } from "@/api/login";
+import { changeDatasource } from "@/api/dataEngine";
 import Cookies from "js-cookie";
-import {encrypt, decrypt} from "@/utils/jsencrypt";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
 
 export default {
   name: "Login",
@@ -111,12 +111,12 @@ export default {
       },
       loginRules: {
         username: [
-          {required: true, trigger: "blur", message: "请输入您的账号"},
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          {required: true, trigger: "blur", message: "请输入您的密码"},
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{required: true, trigger: "blur", message: "请输入验证码"}],
+        code: [{ required: true, trigger: "blur", message: "请输入验证码" }],
       },
       loading: true,
       // 验证码开关
@@ -142,16 +142,15 @@ export default {
   methods: {
     // client_id=x3qwrgrO1wYdz72joZ8YyIuD&scope=basic&response_type=code&state=AB1357&redirect_uri=http://127.0.0.1:8001/login
 
-
     // 校验url
     validateTenantId() {
       let tenantCode = this.$route.query["tenantCode"];
       if (tenantCode != null) {
         // 得到tenantId 查询裤中是否存在该租户
-        isTenantExist({tenantCode: tenantCode}).then((res) => {
+        isTenantExist({ tenantCode: tenantCode }).then((res) => {
           if (res == undefined) {
             this.$message.warning("请访问正确地址！");
-            this.$router.push({path: "/401"});
+            this.$router.push({ path: "/401" });
           } else if (res.data?.tenantId) {
             // 判断当前编号是否存在库中
             this.tenantId = res.data.tenantId;
@@ -165,11 +164,11 @@ export default {
             this.getCookie();
           } else {
             // 当前访问链接中的租户编号不存在
-            this.$router.push({path: "/401"});
+            this.$router.push({ path: "/401" });
           }
         });
       } else {
-        this.$router.push({path: "/401"});
+        this.$router.push({ path: "/401" });
       }
     },
     setConfig() {
@@ -191,9 +190,9 @@ export default {
 
           console.log(
             "" +
-            `url(${
-              process.env.VUE_APP_BASE_IMG_API + loginPageBackgroundImage
-            })`
+              `url(${
+                process.env.VUE_APP_BASE_IMG_API + loginPageBackgroundImage
+              })`
           );
         }
       }
@@ -269,7 +268,7 @@ export default {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, {expires: 30});
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
             Cookies.set("password", encrypt(this.loginForm.password), {
               expires: 30,
             });
@@ -282,29 +281,34 @@ export default {
             Cookies.remove("rememberMe");
           }
           let form = {
-            uri: "?client_id=gly&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.15:8066/oauth/callback",
+            uri: "?client_id=xzz&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.76:8066/oauth/callback",
             ...this.loginForm,
             tenantID: this.tenantId,
           };
           // 调用单点登录
-          ssoLogin(form).then((response) => {
-            this.loading = false;
-            if (response.code === 200) {
-              // Message({message: response.msg, type: "success"});
-              console.log("认证成功！", response)
-              // response.msg 当前用户唯一标识 跳转其他系统使用
-              // this.$store.dispatch("setoauthUUID", response.msg);
-              window.localStorage.setItem("setoauthUUID" + this.loginForm.username, response.msg);
-              setTimeout(() => {
-                global.window.location.href = response.data;
-              }, 1000);
-            }
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
+          ssoLogin(form)
+            .then((response) => {
+              this.loading = false;
+              if (response.code === 200) {
+                // Message({message: response.msg, type: "success"});
+                console.log("认证成功！", response);
+                // response.msg 当前用户唯一标识 跳转其他系统使用
+                // this.$store.dispatch("setoauthUUID", response.msg);
+                window.localStorage.setItem(
+                  "setoauthUUID" + this.loginForm.username,
+                  response.msg
+                );
+                setTimeout(() => {
+                  global.window.location.href = response.data;
+                }, 1000);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
 
           // this.$store
           //   .dispatch("Login", form)
@@ -375,9 +379,9 @@ export default {
   opacity: 1;
   border-radius: 27px;
   background: linear-gradient(
-      135deg,
-      rgba(79, 138, 255, 1) 0%,
-      rgba(75, 94, 255, 1) 100%
+    135deg,
+    rgba(79, 138, 255, 1) 0%,
+    rgba(75, 94, 255, 1) 100%
   );
   box-shadow: 0px 4px 16px rgba(179, 192, 231, 1);
   color: #fff;