cloud-web-corejs 1.0.54-dev.78 → 1.0.54-dev.781

package/src/views/user/home/dev.vue

@@ -0,0 +1,29 @@
+<template>
+  <div id="containt" class="index-home-sys">
+    <i class="iconfont icon-a-kaifa1"></i>
+    <span>{{$t1('开发管理平台')}}</span>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+
+};
+</script>
+<style scoped lang="scss">
+.index-home-sys{
+  background-color: #DEE9F2 !important;margin-top: 10px !important;height: calc(100vh - 52px);border-radius: 12px !important;text-align: center;line-height: calc(100vh - 60px);letter-spacing: 2px;
+  font-size: 48px;font-weight: 600;
+  i{vertical-align: middle;font-weight: 400;margin-right: 24px;color:#225076;font-size:48px;}
+  span{position: relative;
+    &:before{content: "";position: absolute;bottom:0;left:0;width: 223px;height: 16px;background: #96B4CD;z-index: -1;opacity: 0.8;}
+  }
+}
+</style>

package/src/views/user/home/index.vue

@@ -12,6 +12,8 @@
 
 <script>
 import corejsConfig from "@/corejsConfig";
+import settingConfig from "@/settings";
+import { loadViewComponent } from "@base/utils/resolveViewComponent";
 
 export default {
   name: 'home',
@@ -36,9 +38,7 @@ export default {
           let userInfo = res.objx;
           this.userInfo = userInfo;
           let flag = userInfo.flag;
-          if (flag !== 6 && flag !== 7 && flag !== 8) {
-            this.initHome();
-          }
+          this.initHome();
         }
       });
     },
@@ -59,6 +59,15 @@ export default {
       });
     },
     initHome() {
+      let url = null;
+      let userInfo = this.userInfo;
+      let flag = userInfo.flag;
+      if (flag == 6 || flag == 7 || flag == 8) {
+        let url = '/user/home/dev.vue'
+        this.homeContent = require('@base/views' + url).default;
+        this.showHomeContent = true;
+        return
+      }
       this.$http({
         url: USER_PREFIX + '/menu/currentList',
         data: {},
@@ -68,23 +77,18 @@ export default {
           let homeMenu = menus.find(menu => menu.type == 2 && menu.enabled);
           let menuUrl = homeMenu?.url;
 
-          let str1 = "@base/views";
-          let str2 = "@/views";
-          let url = null;
-          if (menuUrl) {
+          let userInfo = this.userInfo;
+          let flag = userInfo.flag;
+
+          if (menuUrl && flag !== 1) {
+            //超级管理员不使用角色首页
             url = menuUrl + '.vue';
           } else {
             let defaultHomePage = this.userInfo.defaultHomePage;
-            url = defaultHomePage ? defaultHomePage : '@base/views/user/home/default.vue'
-          }
-          if (url.startsWith(str1)) {
-            let a = url.slice(str1.length);
-            this.homeContent = require('@base/views' + url.slice(str1.length)).default;
-          } else if (url.startsWith(str2)) {
-            this.homeContent = require('@/views' + url.slice(str2.length)).default;
-          } else {
-            this.homeContent = require('@/views' + url).default;
+            url =  defaultHomePage || settingConfig.defaultHomePage || '@base/views/user/home/default.vue'
           }
+          // 首页菜单不会归属别的子应用，无需 remote 兜底；归属解析见 @base/utils/resolveViewComponent
+          this.homeContent = loadViewComponent(url).component;
 
           this.showHomeContent = true;
           this.flag = 1;

package/src/views/user/login/default.vue

@@ -1,24 +1,54 @@
 <template>
-  <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
-    <div class="login-main" style="height: auto;">
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="账号登录" name="first">
-          <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
-                   label-position="left">
+  <div
+    class="login-container"
+    :class="backgroundClass"
+    ref="login-container"
+    :style="{
+      background: imageUrl
+        ? 'url(' + imageUrl + ') center center/cover no-repeat'
+        : 'auto',
+    }"
+    v-show="showContent"
+  >
+    <div class="login-main" style="height: auto">
+      <el-tabs v-model="activeName" @tab-click="changeTab">
+        <el-tab-pane :label="$t1('账号登录')" name="first" v-if="accountLoagin">
+          <el-form
+            ref="loginForm"
+            :model="loginForm"
+            :rules="loginRules"
+            class="box-form login"
+            autocomplete="on"
+            label-position="left"
+          >
             <el-form-item prop="username" class="txt">
-              <span class="svg-container"><i class="el-icon-user"/></span>
-              <el-input ref="username" v-model="loginForm.username" placeholder="请输入用户名" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+              <span class="svg-container"><i class="el-icon-user" /></span>
+              <el-input
+                ref="username"
+                v-model="loginForm.username"
+                :placeholder="$t1('请输入用户名')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-tooltip :enterable="false" v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+            <el-tooltip
+              :enterable="false"
+              v-model="capsTooltip"
+              content="Caps lock is On"
+              placement="right"
+              manual
+            >
               <el-form-item prop="password" class="txt">
-                <span class="svg-container"><i class="el-icon-lock"/></span>
+                <span class="svg-container"><i class="el-icon-lock" /></span>
                 <el-input
                   :key="passwordType"
                   ref="password"
                   v-model="loginForm.password"
                   :type="passwordType"
-                  placeholder="请输入密码"
+                  :placeholder="$t1('请输入密码')"
                   name=""
                   tabindex="2"
                   autocomplete="on"
@@ -27,41 +57,98 @@
                   @blur="capsTooltip = false"
                   @keyup.enter.native="handleLogin"
                 />
-                <span class="show-pwd" @click="showPwd"><svg-icon
-                  :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"/></span>
+                <span class="show-pwd" @click="showPwd"
+                  ><svg-icon
+                    :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+                /></span>
               </el-form-item>
             </el-tooltip>
             <div class="">
-              <el-checkbox v-model="isRememberPassword">记住密码</el-checkbox>
+              <el-checkbox v-model="isRememberPassword">{{
+                $t1("记住密码")
+              }}</el-checkbox>
             </div>
-            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+            <el-button
+              :loading="loading"
+              type="primary"
+              @click.prevent.stop="handleLogin"
+              class="btn"
+              >{{ $t1("登录") }}</el-button
+            >
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="手机验证码登录" name="second">
-          <el-form ref="loginForm" :model="loginForm2" :rules="loginRules" class="box-form login" autocomplete="on"
-                   label-position="left">
-            <el-form-item prop="username" class="txt" style="width:66%">
-              <span class="svg-container"><i class="el-icon-mobile-phone"/></span>
-              <el-input ref="mobile" v-model="loginForm2.username" placeholder="请输入手机号" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+        <el-tab-pane :label="$t1('手机登录')" name="second" v-if="phoneLogin">
+          <el-form
+            ref="loginForm"
+            :model="loginForm2"
+            :rules="loginRules"
+            class="box-form login"
+            autocomplete="on"
+            label-position="left"
+          >
+            <el-form-item prop="username" class="txt" style="width: 66%">
+              <span class="svg-container"><i class="el-icon-mobile-phone" /></span>
+              <el-input
+                ref="mobile"
+                v-model="loginForm2.username"
+                :placeholder="$t1('请输入手机号')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-button class="btn-send" type="success" :class="{'gray-btn':isCounting}" @click="sendCode">
+            <el-button
+              class="btn-send"
+              type="success"
+              :class="{ 'gray-btn': isCounting }"
+              @click="sendCode"
+            >
               {{ buttonText }}
             </el-button>
             <el-form-item prop="smsCode" class="txt">
-              <span class="svg-container"><i class="el-icon-message"/></span>
-              <el-input ref="smsCode" v-model="loginForm2.smsCode" placeholder="请输入验证码" name="" type="text"
-                        tabindex="1" autocomplete="on" @keyup.enter.native="handleLogin"/>
+              <span class="svg-container"><i class="el-icon-message" /></span>
+              <el-input
+                ref="smsCode"
+                v-model="loginForm2.smsCode"
+                :placeholder="$t1('请输入验证码')"
+                name=""
+                type="text"
+                tabindex="1"
+                autocomplete="on"
+                @keyup.enter.native="handleLogin"
+              />
             </el-form-item>
-            <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
+            <el-button
+              :loading="loading"
+              type="primary"
+              @click.prevent.stop="handleLogin"
+              class="btn"
+              >{{ $t1("登录") }}</el-button
+            >
           </el-form>
         </el-tab-pane>
+        <el-tab-pane :label="$t1('扫码登录')" name="third" v-if="qrLogin">
+          <div class="login-qr">
+            <img class="qr__img" :src="qrBase64" v-if="activeName === 'third'" />
+            <span class="qr__txt">{{ $t1("扫一扫，登录系统") }}</span>
+            <div v-if="qrExpired" @click="initQR" class="qr__lose">
+              <span><i class="el-icon-refresh"></i>{{ $t1("二维码失效") }}</span>
+            </div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
-    <div class="tc copyright">
+    <div class="tc copyright" v-show="loginConfig.hide_filing_info !== true">
       <slot name="footer">
-        © 广州同望科技发展有限公司
-        <span style="margin-left:50px;">4000646100</span>
+        © {{ this.$t1(loginConfig.filing_company || "广州同望科技发展有限公司") }}
+        <span style="margin-left: 50px" v-if="!!loginConfig.filing_number">{{
+          loginConfig.filing_number + "   " + (loginConfig.phone || "4000646100")
+        }}</span>
+        <span style="margin-left: 50px" v-if="!loginConfig.filing_number">{{
+          loginConfig.phone || "4000646100"
+        }}</span>
       </slot>
     </div>
   </div>
@@ -71,30 +158,24 @@
 import mixin from "./indexMixin";
 
 export default {
-  name: 'Login',
-  mixins: [mixin]
-}
+  name: "Login",
+  mixins: [mixin],
+};
 </script>
 <style lang="scss" scoped>
-@import '@/resources/css/login.scss';
+@import "@/resources/css/login.scss";
 
 .login-container.tc {
   background: url(~@/resources/images/bg-login5.jpg) center center/cover no-repeat;
 }
 
-.login-container.chigo {
-  background: url(~@/resources/images/bg-login6.jpg) center center/cover no-repeat;
-}
-
-.login-container.pcp {
-  background: url(~@/resources/images/bg-login8.jpg) center center/cover no-repeat;
-}
-
 .el-select-dropdown {
   right: 5px;
   top: 25px;
 }
-
+.box-form {
+  height: 330px;
+}
 ::v-deep .login-main .el-tabs__header {
   margin-bottom: 0;
 
@@ -128,4 +209,44 @@ export default {
     color: #8a8686;
   }
 }
+
+::v-deep .login-main .el-tabs__header .el-tabs__nav .el-tabs__item {
+  width: 33%;
+}
+.login-qr {
+  height: 330px;
+  text-align: center;
+  position: relative;
+  .qr__img {
+    width: 220px;
+    margin-top: 40px;
+  }
+  .qr__txt {
+    color: #666;
+    font-size: 15px;
+    display: block;
+  }
+  .qr__lose {
+    position: absolute;
+    cursor: pointer;
+    width: 192px;
+    height: 192px;
+    background: rgb(255 255 255 / 76%);
+    top: 60px;
+    left: 136px;
+    color: #000;
+    line-height: 64px;
+    font-weight: 600;
+    font-size: 26px;
+    span {
+      line-height: 1;
+      margin-top: 30px;
+    }
+    i {
+      display: block;
+      font-size: 42px;
+      margin-top: 46px;
+    }
+  }
+}
 </style>

package/src/views/user/login/index.vue

@@ -6,10 +6,8 @@
 import defaultView from "@base/views/user/login/default.vue";
 
 export default {
-  name: 'Login',
-  components: {defaultView}
-}
+  name: "Login",
+  components: { defaultView },
+};
 </script>
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>