登录页面调整

applications/architecture-dee/src/store/modules/user.js

@@ -109,7 +109,12 @@ const actions = {
           localStorage.setItem('user', userVO.name)
           localStorage.setItem('fullName', userVO.nickName)
           localStorage.setItem('userId', userVO.id)
-          localStorage.setItem('uploadUrl', response.items.prefsSite && response.items.prefsSite.endPoint ? response.items.prefsSite.endPoint : '')
+          let uploadUrl = response.items.prefsSite && response.items.prefsSite.endPoint ? response.items.prefsSite.endPoint : ''
+          if (process.env.NODE_ENV === 'development') {
+            // eslint-disable-next-line no-undef
+            uploadUrl = VUE_APP_BASE_API
+          }
+          localStorage.setItem('uploadUrl', uploadUrl)
           commit('SET_USER_ID', userVO.id)
           localStorage.setItem('token', token)
           showMessage('登录成功!', 'success')

applications/architecture-dee/src/views/login/index.vue

@@ -34,32 +34,16 @@
     <img src="/images/li.gif" style="position: fixed;width: 100%;bottom: 0;z-index:-1;">
   </div> -->
   <div class="login-background">
-    <img class="login-pic" src="/images/login-pic.png" alt="">
-    <div class="login-box">
-      <div class="login-box-header">
-        <div v-if="supportedLanguages && supportedLanguages.length>1" class="lang-box">
-          <el-dropdown
-            id="plat-setting-container"
-            class="right-menu-item"
-            trigger="click"
-          >
-            <div class="plat-setting-wrapper">
-              <svg-icon class-name="plat-setting-icon" icon-class="i18n" />
-            </div>
-            <el-dropdown-menu slot="dropdown" class="setting-dropdown" popper-class="dropdown-zindex">
-              <el-dropdown-item
-                v-for="menu in supportedLanguages"
-                :key="menu.id"
-                @click.native="changeLang(menu.langCode)"
-              >
-                <span style="display: block">{{ menu.langName }}</span>
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
+    <div class="logo_box">
+      <img class="logo_img" src="/images/logo.png" alt="">
+      <div class="logo_text">
+        <div class="logo_text_top">多传感器联合标定与校准系统</div>
+        <div class="logo_text_bottom">数据库管理软件</div>
       </div>
-      <div class="login-box-body">
-
+    </div>
+    <div class="login-round">
+      <div class="login-box">
+        <span class="welcom_login">欢迎登录</span>
         <el-form ref="loginForm" :model="loginForm" :rules="loginFormRules" class="login-form">
           <el-form-item prop="account">
             <el-input ref="account" v-model="loginForm.account" :placeholder="$t('用户名')">
@@ -81,9 +65,6 @@
           <!-- <span>忘记密码</span> -->
         </div>
       </div>
-      <div class="login-box-foot">
-        Copyright 2021 yond-e , Inc. All rights reserved
-      </div>
     </div>
     <dee-dialog
       :title="$t('修改密码')"
@@ -217,6 +198,9 @@ export default {
       }
     },
     getMenusPerm() {
+      if (!this.activeWorkSpace) {
+        return this.$utils.showMessageWarning('您没有访问数据中心的权限，请联系管理员！')
+      }
       getPageByWorkspaceId({ id: this.activeWorkSpace.id }).then(res => {
         const allApps = res.items.sourceDxAppWorkLink ? res.items.sourceDxAppWorkLink.map(r => {
           return r.target
@@ -414,150 +398,112 @@ export default {
 <style lang="scss">
 .login-background{
   position: relative;
-  .login-pic{
-    position: absolute;
-    left:8%;
-    top: 0;
-    bottom: 0;
-    display: block;
-    width: 47%;
-    // height: 628px;
-    margin: auto;
-  }
-  .login-box{
-    width: 400px;
-    height: 430px;
-    border-radius: 10px;
-    background: #FFF;
-    position: absolute;
-    left: 52%;
-    top: 0;
-    bottom: 0;
-    /* margin-left: -200px; */
-    /* margin-top: -280px; */
-    margin: auto 0 auto 0;
-
-    .password-box{
-      display: flex;
-      padding: 30px 0;
-      justify-content: space-between;
-      font-size: 14px;
-      color: #606266;
-      cursor: pointer;
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+    // background-image: url('/images/river.png'), linear-gradient(90deg, #324A8D 20%, #4BAE47 100%);
+  background-image: url('/images/bg.png');
+  background-size: cover;
+  background-repeat: no-repeat;
+  position: fixed;
+  background-position: bottom;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  .logo_box{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position:absolute;
+    left:2vw;
+    top:2vh;
+    .logo_img{
+      width:5vw;
     }
-    .login-box-header{
-      height: 62px;
-      width: 100%;
-      background: url('/images/login-header.png');
-      position: absolute;
-      top: 0;
-      padding: 8px;
-      box-sizing: border-box;
-      .lang-box{
-        display: flex;
-        padding:10px 8px;
-        align-items: center;
-        justify-content: flex-end;
-        #plat-setting-container{
-          .plat-setting-wrapper{
-           .plat-setting-icon{
-              font-size: 26px;
-            }
-          }
-        }
+    .logo_text{
+      .logo_text_top{
+        font-size: 18px;
       }
-    }
-    .login-box-body{
-      padding:80px 20px;
-      .el-form-item {
-        margin-bottom: 30px
+      .logo_text_bottom{
+        font-size: 14px;
+        color:#313337;
       }
-
     }
-    .login-box-foot{
-      width: 100%;
-      padding: 26px 20px;
-      box-sizing: border-box;
-      position: absolute;
-      bottom: 0;
-      color: #666666;
-      font-size: 14px;
-      &::before{
-        content: '';
-        background: #DCDCDC;
-        height: 1px;
-        left: 20px;
-        right: 20px;
-        top: 0;
-        position: absolute
-      }
+  }
+  .login-round{
+    margin-top:5vh;
+    height: 32vw;
+    width: 32vw;
+    background-image: url('/images/login-pic.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat; /* 确保背景图像不重复 */
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .login-box{
+    width: 50%;
+    height: 50%;
+    .welcom_login{
+      height: 15%;
+      margin-bottom:5%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 20px;
+      font-weight: 800;
+      color:black;
     }
     .login-form{
         .el-input{
           font-size:18px;
-          height: 50px
+          height:2.4vw;
         }
         .el-input__prefix{
-          line-height: 50px;
-          width: 60px;
-          color: #1988C0
+          //background-color: red;
+          line-height: 2.4vw;
+          width: 2.4vw;
+          color:#8598A7;
+          // color: #1988C0
         }
         .el-input__inner {
-          background-color: transparent;
-          border-top: 0;
-          border-left: 0;
-          border-right: 0;
+          background-color: transparent !important;;
           border-radius: 0;
           color: #475057;
-          height:50px;
-          line-height: 50px;
-          padding-left: 60px;
+          height:2.4vw;
+          line-height: 2.4vw;
+          padding-left: 2.4vw;
         }
     }
-
-  }
-  .imgSize {
-    height: 25px;
-  }
-
-    width: 100%;
-    height: 100%;
-    // background-image: url('/images/river.png'), linear-gradient(90deg, #324A8D 20%, #4BAE47 100%);
-    background-image: url('/images/bg.png');
-    background-size: cover;
-    background-repeat: no-repeat;
-    position: fixed;
-    background-position: bottom;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    .dee-form2{
-      padding:0;
-    }
-    // .login-form{
-    //   width: 332px;
-    //   .user-pic{
-    //     width:16px;
-    //     height:20px;
-    //   }
-    // }
-
-  .login-btn {
+    .login-btn {
     width: 100%;
-    height: 50px;
-    background: linear-gradient(-90deg, #2C9AD2, #2BA3E0);
+    height: 2.4vw;
+    background-image: url('/images/login_btn.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat; /* 确保背景图像不重复 */
     border-width:0;
     // border-radius: 4px;
     color: #ffffff;
     font-size: 18px;
     &:hover{
-     background:#2BA3E0;
-     color: #FFF
+    background-image: url('/images/login_btn_hover.png');
+    color: #FFF
     }
     // text-shadow: 0 1px 10px rgba(3, 25, 74, 0.34);
 
   }
+    .password-box{
+      display: flex;
+      padding: 2vh 0;
+      justify-content: space-between;
+      font-size: 14px;
+      color: #606266;
+      cursor: pointer;
+    }
+  }
+  }
+
   .el-button.is-loading {
     .el-icon-loading {
       left:130px;