ezhizao_zx 1 rok pred
rodič
commit
286bdfb7fe

+ 33 - 34
src/views/business/tenant/form.vue

@@ -10,40 +10,39 @@
             </el-icon>
             企业信息</span
           >
-          <el-button-group>
-            <el-button
-              v-if="editStatus"
-              type="primary"
-              size="small"
-              icon="Finished"
-              @click="submitForm"
-              >保存</el-button
-            >
-            <el-button
-              v-else
-              type="warning"
-              size="small"
-              icon="Edit"
-              @click="editStatus = true"
-              >修改</el-button
-            >
-            <el-button
-              v-if="form.id && editStatus"
-              type="info"
-              size="small"
-              icon="Close"
-              @click="editStatus = false"
-              >取消修改</el-button
-            >
-            <el-button
-              v-if="form.id"
-              type="success"
-              size="small"
-              @click="getForm"
-            >
-              <i class="fa fa-refresh" aria-hidden="true" /> 刷新
-            </el-button>
-          </el-button-group>
+          <el-button
+            v-if="editStatus"
+            type="primary"
+            size="small"
+            icon="Finished"
+            @click="submitForm"
+            >保存</el-button
+          >
+          <el-button
+            v-else
+            type="warning"
+            size="small"
+            icon="Edit"
+            @click="editStatus = true"
+            >修改</el-button
+          >
+          <el-button
+            v-if="form.id && editStatus"
+            type="info"
+            size="small"
+            icon="Close"
+            @click="editStatus = false"
+            >取消修改</el-button
+          >
+          <el-button
+            v-if="form.id"
+            type="success"
+            size="small"
+            icon="Refresh"
+            @click="getForm"
+          >
+            刷新
+          </el-button>
           <div class="screen-btn" @click="handleScreen">
             <template v-if="!isFullscreen">
               <i class="fa fa-window-maximize" aria-hidden="true" />

+ 113 - 96
src/views/login.vue

@@ -5,50 +5,69 @@
       <div>提供只能财务软件 代记账等 助力企业节省成本</div>
     </div>
     <div class="login-r">
-      <img class="logo" referrerpolicy="no-referrer" src="@/assets/logo/logo.png" />
+      <img
+        class="logo"
+        referrerpolicy="no-referrer"
+        src="@/assets/logo/logo.png"
+      />
       <span class="title">欢迎使用账羚羊财务平台</span>
-      <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
+      <el-form
+        ref="loginRef"
+        :model="loginForm"
+        :rules="loginRules"
+        class="login-form"
+      >
         <el-form-item prop="username">
-          <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="账号">
+          <el-input
+            v-model="loginForm.username"
+            type="text"
+            size="large"
+            auto-complete="off"
+            placeholder="账号"
+          >
             <template #prefix>
               <svg-icon icon-class="user" class="el-input__icon input-icon" />
             </template>
           </el-input>
         </el-form-item>
         <el-form-item prop="password">
-          <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="密码"
-            show-password @keyup.enter="handleLogin">
+          <el-input
+            v-model="loginForm.password"
+            type="password"
+            size="large"
+            auto-complete="off"
+            placeholder="密码"
+            show-password
+            @keyup.enter="handleLogin"
+          >
             <template #prefix>
-              <svg-icon icon-class="password" class="el-input__icon input-icon" />
+              <svg-icon
+                icon-class="password"
+                class="el-input__icon input-icon"
+              />
             </template>
           </el-input>
         </el-form-item>
-        <!-- <el-form-item prop="code" v-if="captchaEnabled">
-          <el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleLogin">
-            <template #prefix>
-              <svg-icon icon-class="validCode" class="el-input__icon input-icon" />
-            </template>
-          </el-input>
-          <div class="login-code">
-            <img :src="codeUrl" @click="getCode" class="login-code-img" />
-          </div>
-        </el-form-item> -->
+
         <div class="tool">
           <el-checkbox v-model="loginForm.rememberMe">5天自动登录</el-checkbox>
-          <span style="font-size: 14px;">忘记密码</span>
+          <span style="font-size: 14px">忘记密码</span>
         </div>
-        <el-form-item style="width:100%;">
-          <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
+        <el-form-item style="width: 100%">
+          <el-button
+            :loading="loading"
+            size="large"
+            type="primary"
+            style="width: 100%"
+            @click.prevent="handleLogin"
+          >
             <span v-if="!loading">立即登录</span>
             <span v-else>登 录 中...</span>
           </el-button>
-          <!--
-          <div style="float: right;" v-if="register">
-            <router-link class="link-type" :to="'/register'">立即注册</router-link>
-          </div>
-          -->
         </el-form-item>
-        <div class="warning-text">登录即表示您已阅读并同意<a>《用户使用协议》</a>和<a>《隐私政策》</a></div>
+        <div class="warning-text">
+          登录即表示您已阅读并同意<a>《用户使用协议》</a>和<a>《隐私政策》</a>
+        </div>
       </el-form>
       <!--  底部  -->
       <div class="login-footer">
@@ -60,53 +79,50 @@
 
 <script setup>
 // import { getCodeImg } from '@/api/login'
-import Cookies from 'js-cookie'
-import { encrypt, decrypt } from '@/utils/jsencrypt'
-import useUserStore from '@/store/modules/user'
-import { setTenant } from '@/utils/auth'
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+import useUserStore from "@/store/modules/user";
+import { setTenant } from "@/utils/auth";
 
-import { getSnmsTenantId } from '@/api/login'
+import { getSnmsTenantId } from "@/api/login";
 
-const userStore = useUserStore()
-const router = useRouter()
-const { proxy } = getCurrentInstance()
+const userStore = useUserStore();
+const router = useRouter();
+const { proxy } = getCurrentInstance();
 
 const loginForm = ref({
-  username: '',
-  password: '',
+  username: "",
+  password: "",
   rememberMe: false,
-  code: '',
-  uuid: ''
-})
+  code: "",
+  uuid: "",
+});
 
 const loginRules = {
-  username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
-  password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-  code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
-}
+  username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
+  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
+  code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+};
 
-const loading = ref(false)
-// const codeUrl = ref('')
-// 验证码开关
-// const captchaEnabled = ref(true)
-// 注册开关
-// const register = ref(true)
-const redirect = ref(undefined)
+const loading = ref(false);
+const redirect = ref(undefined);
 
 function handleLogin() {
   proxy.$refs.loginRef.validate((valid) => {
     if (valid) {
-      loading.value = true
+      loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
-        Cookies.set('username', loginForm.value.username, { expires: 30 })
-        Cookies.set('password', encrypt(loginForm.value.password), { expires: 30 })
-        Cookies.set('rememberMe', loginForm.value.rememberMe, { expires: 30 })
+        Cookies.set("username", loginForm.value.username, { expires: 30 });
+        Cookies.set("password", encrypt(loginForm.value.password), {
+          expires: 30,
+        });
+        Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
       } else {
         // 否则移除
-        Cookies.remove('username')
-        Cookies.remove('password')
-        Cookies.remove('rememberMe')
+        Cookies.remove("username");
+        Cookies.remove("password");
+        Cookies.remove("rememberMe");
       }
       // 调用action的登录方法
       // userStore
@@ -123,41 +139,40 @@ function handleLogin() {
       //     }
       //     */
       //   })
-      login()
+      login();
     }
-  })
+  });
 }
 
-
 function login() {
-  let userName = loginForm.value.username
-  // if (loginType.value === '01') {
-  //   userName = loginForm.value.username
-  // } else {
-  //   userName = loginForm.value.adminUserName
-  // }
-  getSnmsTenantId(userName).then(res => {
-    if (res.data) {
-      setTenant(res.data)
-      // 调用action的登录方法
-      userStore
-        .login(loginForm.value)
-        .then(() => {
-          console.log(loginForm.value)
-          router.push({ path: redirect.value || '/' })
-        })
-        .catch(() => {
-          loading.value = false
-          // 重新获取验证码
-          if (captchaEnabled.value) {
-            getCode()
-          }
-        })
-    } else {
-      proxy.$modal.msgError(res.msg);
-      loading.value = false
-    }
-  })
+  let userName = loginForm.value.username;
+
+  getSnmsTenantId(userName)
+    .then((res) => {
+      if (res.data) {
+        setTenant(res.data);
+        // 调用action的登录方法
+        userStore
+          .login(loginForm.value)
+          .then(() => {
+            console.log(loginForm.value);
+            router.push({ path: redirect.value || "/" });
+          })
+          .catch(() => {
+            loading.value = false;
+            // 重新获取验证码
+            if (captchaEnabled.value) {
+              getCode();
+            }
+          });
+      } else {
+        proxy.$modal.msgError(res.msg);
+        loading.value = false;
+      }
+    })
+    .catch(() => {
+      loading.value = false;
+    });
 }
 /*
 function getCode() {
@@ -172,18 +187,19 @@ function getCode() {
 */
 
 function getCookie() {
-  const username = Cookies.get('username')
-  const password = Cookies.get('password')
-  const rememberMe = Cookies.get('rememberMe')
+  const username = Cookies.get("username");
+  const password = Cookies.get("password");
+  const rememberMe = Cookies.get("rememberMe");
   loginForm.value = {
     username: username === undefined ? loginForm.value.username : username,
-    password: password === undefined ? loginForm.value.password : decrypt(password),
-    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-  }
+    password:
+      password === undefined ? loginForm.value.password : decrypt(password),
+    rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+  };
 }
 
 // getCode()
-getCookie()
+getCookie();
 </script>
 
 <style lang='scss' scoped>
@@ -197,7 +213,8 @@ getCookie()
     display: flex;
     flex-direction: column;
     flex: 3;
-    background: url('../assets/images/login-bg.jpg') no-repeat center center/cover;
+    background: url("../assets/images/login-bg.jpg") no-repeat center
+      center/cover;
     align-items: center;
 
     div {
@@ -211,7 +228,7 @@ getCookie()
       letter-spacing: 2px;
 
       span {
-        color: #00FFF6;
+        color: #00fff6;
       }
     }
 

+ 9 - 2
src/views/system/menu/index.vue

@@ -256,6 +256,7 @@
           <el-col :span="12">
             <el-form-item label="显示排序" prop="orderNum">
               <el-input-number
+                style="width: 100%"
                 v-model="form.orderNum"
                 controls-position="right"
                 :min="0"
@@ -437,8 +438,14 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button size="small" icon="Close" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>

+ 8 - 2
src/views/system/module/index.vue

@@ -157,8 +157,14 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            icon="Finished"
+            size="small"
+            @click="submitForm"
+            >确 定</el-button
+          >
+          <el-button icon="Close" size="small" @click="cancel">取 消</el-button>
         </div>
       </template>
     </el-dialog>